hansha
/
pay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日工工时页面修改

Browse Source
master
wanglei 7 months ago
parent da9ff84197
commit 4bce6d8302
1 changed files with 113 additions and 248 deletions
Show Stats Download Patch File Download Diff File

351
ruoyi-ui/src/views/pay/dayWorkHours/index.vue
Unescape View File

@ -151,7 +151,7 @@
</div> </div>
<!-- 添加或修改日工工时对话框 --> <!-- 添加或修改日工工时对话框 -->
<el-dialog class="my-dialog" :title="title" :visible.sync="open" width="980px" append-to-body :close-on-click-modal="false"> <el-dialog class="my-dialog" :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -171,7 +171,7 @@
label="员工姓名" label="员工姓名"
:prop="'empInfos.' + index + '.empName'" :prop="'empInfos.' + index + '.empName'"
:rules="{required: true, message: '员工姓名不能为空', trigger: 'blur'}"> :rules="{required: true, message: '员工姓名不能为空', trigger: 'blur'}">
<el-input placeholder="请选择员工姓名" readonly v-model="elctment.empName" @focus="changeEmp(elctment, index)"> <el-input placeholder="请选择员工姓名" readonly v-model="elctment.empName" @focus="changeEmp(elctment, index,1)">
<i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i> <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -181,7 +181,7 @@
label="部门名称" label="部门名称"
:prop="'empInfos.' + index + '.deptId'" :prop="'empInfos.' + index + '.deptId'"
:rules="{required: true, message: '员工姓名不能为空', trigger: 'blur'}"> :rules="{required: true, message: '员工姓名不能为空', trigger: 'blur'}">
<treeselect v-model="elctment.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="changeDeptChange"/> <treeselect v-model="elctment.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="changeDept"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -218,21 +218,9 @@
<el-form-item <el-form-item
label="业务员" label="业务员"
:prop="'dwHoursContrasts.' + index + '.salesman'"> :prop="'dwHoursContrasts.' + index + '.salesman'">
<el-autocomplete <el-input placeholder="请选择业务员" readonly v-model="domain.salesman" @focus="changeEmp(domain, index,2)">
popper-class="my-autocomplete" <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
v-model="domain.salesman" </el-input>
:fetch-suggestions="querySaleSearch"
placeholder="请选择业务员"
@select="((business) => {handleSaleQuerySelect(business, index)})">
<i
class="el-icon-edit el-input__icon"
slot="suffix"
@click="handleSaleQueryIconClick(index)">
</i>
<template slot-scope="{ item }">
<div class="name">{{ item.name }}</div>
</template>
</el-autocomplete>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -249,7 +237,7 @@
<el-form-item label="部门名称" :prop="'dwHoursContrasts.' + index + '.deptId'" <el-form-item label="部门名称" :prop="'dwHoursContrasts.' + index + '.deptId'"
:rules="{required: true, message: '部门不能为空', trigger: 'change'}" :rules="{required: true, message: '部门不能为空', trigger: 'change'}"
v-if="domain.isHelper === 1"> v-if="domain.isHelper === 1">
<treeselect v-model="domain.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="((dept) => {currDepartChange(dept, index)})"/> <treeselect v-model="domain.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -271,199 +259,55 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- <el-dialog class="my-dialog" :title="title" :visible.sync="opena" width="980px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" v-if="title !== '日工工时详情'"> <!-- 选择员工信息 -->
<el-row> <el-dialog title="双击选择员工" :visible.sync="emp.open" width="900px" append-to-body top="6vh">
<el-col :span="8"> <div>
<el-form-item label="员工姓名" prop="empName"> <el-form :model="emp.queryParams" :inline="true" label-width="70px">
<el-select v-model="form.empName" filterable clearable placeholder="请选择" @change="getEmployee"> <el-form-item label="员工名称" prop="name" style="margin-bottom: 10px">
<el-option <el-input
v-for="item in form.employeeList" v-model="emp.queryParams.name"
:key="item.id" placeholder="请输入员工名称"
:label="item.name" clearablesize="small"
:value="item.id"> @keyup.enter.native="empQuery"
</el-option> />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门名称" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="changeDeptChange"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="日工日期" prop="date">
<el-date-picker clearable
v-model="form.date"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择日工日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row v-for="(domain, index) in form.dwHoursContrasts" :key="domain.key">
<el-col :span="1.5">
<el-form-item
label="开始时间"
:prop="'dwHoursContrasts.' + index + '.beginTime'"
:rules="{required: true, message: '开始时间不能为空', trigger: 'blur'}">
<el-time-picker v-model="domain.beginTime" value-format="HH:mm" format="HH:mm" placeholder="开始时间" style="width: 145px;"></el-time-picker>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item
label="结束时间"
:prop="'dwHoursContrasts.' + index + '.fnishTime'"
:rules="{required: true, message: '结束时间不能为空', trigger: 'blur'}">
<el-time-picker v-model="domain.fnishTime" value-format="HH:mm" format="HH:mm" placeholder="结束时间" style="width: 145px;"></el-time-picker>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item
label="业务员"
:prop="'dwHoursContrasts.' + index + '.salesman'">
<el-autocomplete
popper-class="my-autocomplete"
v-model="domain.salesman"
:fetch-suggestions="querySaleSearch"
placeholder="请选择业务员"
@select="((business) => {handleSaleQuerySelect(business, index)})">
<i
class="el-icon-edit el-input__icon"
slot="suffix"
@click="handleSaleQueryIconClick(index)">
</i>
<template slot-scope="{ item }">
<div class="name">{{ item.name }}</div>
</template>
</el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item
label="是否帮工" :prop="'dwHoursContrasts.' + index + '.isHelper'"
:rules="{required: true, message: '请选择是否帮工', trigger: 'change'}">
<el-radio-group v-model="domain.isHelper" @change="getHelpers">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item label="部门名称" :prop="'dwHoursContrasts.' + index + '.deptId'"
:rules="{required: true, message: '部门不能为空', trigger: 'change'}"
v-if="domain.isHelper === 1">
<treeselect v-model="domain.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="((dept) => {currDepartChange(dept, index)})"/>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item class="my-delete">
<el-button size="mini" @click.prevent="removeDomain(domain)">删除</el-button>
</el-form-item> </el-form-item>
</el-col> <el-form-item style="margin-bottom: 10px">
</el-row> <el-button type="primary" icon="el-icon-search" size="small" @click="empQuery">搜索</el-button>
<el-row>
<el-col :span="24">
<el-form-item>
<el-button size="mini" @click="addDomain">新增时间段</el-button>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" v-if="title === '日工工时详情'">
<el-row> <el-table border v-loading="emp.loading" :data="emp.list" @row-dblclick="empRowChange">
<el-col :span="8"> <el-table-column label="员工姓名" align="center" prop="name" :show-overflow-tooltip="true" min-width="120"/>
<el-form-item label="员工姓名" prop="empName"> <el-table-column label="所属部门" align="center" prop="deptName" :show-overflow-tooltip="true" min-width="120"/>
<el-select v-model="form.empName" filterable clearable placeholder="请选择" @change="getEmployee" disabled> <el-table-column label="状态" align="center" prop="deleted">
<el-option <template slot-scope="scope">
v-for="item in form.employeeList" <dict-tag :options="dict.type.pay_del_status" :value="scope.row.deleted"/>
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门名称" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="changeDeptChange" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="日工日期" prop="date">
<el-date-picker clearable
v-model="form.date"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择日工日期" disabled>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row v-for="(domain, index) in form.dwHoursContrasts" :key="domain.key">
<el-col :span="1.5">
<el-form-item
label="开始时间"
:prop="'dwHoursContrasts.' + index + '.beginTime'"
:rules="{required: true, message: '开始时间不能为空', trigger: 'blur'}">
<el-time-picker v-model="domain.beginTime" value-format="HH:mm" format="HH:mm" placeholder="开始时间" disabled style="width: 145px;"></el-time-picker>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item
label="结束时间"
:prop="'dwHoursContrasts.' + index + '.fnishTime'"
:rules="{required: true, message: '结束时间不能为空', trigger: 'blur'}">
<el-time-picker v-model="domain.fnishTime" value-format="HH:mm" format="HH:mm" placeholder="结束时间" disabled style="width: 145px;"></el-time-picker>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item
label="业务员"
:prop="'dwHoursContrasts.' + index + '.salesman'">
<el-autocomplete
popper-class="my-autocomplete"
v-model="domain.salesman"
:fetch-suggestions="querySaleSearch"
placeholder="请选择业务员"
@select="((business) => {handleSaleQuerySelect(business, index)})" disabled>
<i
class="el-icon-edit el-input__icon"
slot="suffix"
@click="handleSaleQueryIconClick(index)">
</i>
<template slot-scope="{ item }">
<div class="name">{{ item.name }}</div>
</template> </template>
</el-autocomplete> </el-table-column>
</el-form-item> <el-table-column label="性别" align="center" prop="sex">
</el-col> <template slot-scope="scope">
<el-col :span="1.5"> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
<el-form-item </template>
label="是否帮工" :prop="'dwHoursContrasts.' + index + '.isHelper'" </el-table-column>
:rules="{required: true, message: '请选择是否帮工', trigger: 'change'}"> <el-table-column label="年龄" align="center" prop="age" />
<el-radio-group v-model="domain.isHelper" @change="getHelpers" disabled> <el-table-column label="手机号" align="center" prop="phone" min-width="100"/>
<el-radio :label="0">否</el-radio> <el-table-column label="身份证号" align="center" prop="idcard" min-width="100" />
<el-radio :label="1">是</el-radio> </el-table>
</el-radio-group>
</el-form-item> <pagination
</el-col> v-show="emp.total>0"
<el-col :span="1.5"> :total="emp.total"
<el-form-item label="部门名称" :prop="'dwHoursContrasts.' + index + '.deptId'" :page.sync="emp.queryParams.pageNum"
:rules="{required: true, message: '部门不能为空', trigger: 'change'}" :limit.sync="emp.queryParams.pageSize"
v-if="domain.isHelper === 1"> @pagination="empQuery"
<treeselect v-model="domain.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" disabled style="width: 200px" @select="((dept) => {currDepartChange(dept, index)})"/> />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-if="title !== '日工工时详情'">确 定</el-button> <el-button @click="empCancel">取 消</el-button>
<el-button @click="cancel">取 消</el-button> </div>
</div> </div>
</el-dialog> </el-dialog>
-->
</div> </div>
</template> </template>
@ -477,6 +321,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "DayWorkHours", name: "DayWorkHours",
dicts: ['pay_workshop', 'sys_user_sex', 'pay_del_status'],
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
@ -554,7 +399,27 @@ export default {
note: [ note: [
{ required: true, message: "备注不能为空", trigger: "blur" } { required: true, message: "备注不能为空", trigger: "blur" }
] ]
} },
/** 选择员工*/
emp: {
// 1 员工选择 2业务员选择
type: null,
// 是否显示弹出层
open: false,
// 列表遮罩层
loading: true,
// 列表查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined
},
// 表格数据
list: [],
// 总条数
total: 0,
index: 0
},
}; };
}, },
created() { created() {
@ -604,7 +469,7 @@ export default {
/** 查询日工工时列表 */ /** 查询日工工时列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams.tenantId = this.gsInfo.active_id; // this.queryParams.tenantId = this.gsInfo.active_id;
listDayWorkHours(this.queryParams).then(response => { listDayWorkHours(this.queryParams).then(response => {
this.dayWorkHoursList = response.rows; this.dayWorkHoursList = response.rows;
this.total = response.total; this.total = response.total;
@ -685,7 +550,7 @@ export default {
}); });
}, },
/** 查询时选择部门 */ /** 查询时选择部门 */
changeDeptChange(dept) { changeDept(dept) {
this.form.deptName = dept.label this.form.deptName = dept.label
}, },
getSummaries(param) { getSummaries(param) {
@ -712,13 +577,6 @@ export default {
}); });
return sums; return sums;
}, },
/** 查询员工 */
getNamelist() {
getEmpNameList().then(response => {
this.queryParams.employeeList = response.data;
this.form.employeeList = response.data;
})
},
/** 查询时选择员工 */ /** 查询时选择员工 */
getEmploy(val) { getEmploy(val) {
this.queryParams.employeeList.forEach(employ => { this.queryParams.employeeList.forEach(employ => {
@ -743,12 +601,6 @@ export default {
} }
}) })
}, },
/** 查询部门 */
getTreeselect() {
treeselect().then(response => {
this.deptOptions = response.data;
})
},
/** 查询时选择部门 */ /** 查询时选择部门 */
currDeptChange(dept) { currDeptChange(dept) {
this.form.deptName = dept.label this.form.deptName = dept.label
@ -818,8 +670,6 @@ export default {
}] }]
}; };
this.resetForm("form"); this.resetForm("form");
this.getNamelist();
this.getTreeselect();
}, },
// 新增员工 // 新增员工
addElet() { addElet() {
@ -928,29 +778,44 @@ export default {
} }
}); });
}, },
replaceall( restr ,oldstr, newstr ){ // 添加包活派工单 选择员工
while (restr.indexOf(oldstr) >= 0){ changeEmp(val,index,type){
restr = restr.replace(oldstr,newstr); this.emp.open = true;
} this.emp.index = index;
return restr; this.emp.type = type;
}, this.emp.queryParams.pageNum = 1;
querySaleSearch(queryString, cb) { this.empQuery();
let saleList = this.saleList; },
let results = queryString ? saleList.filter(this.createSaleFilter(queryString)) : saleList; /** 员工列表查询 */
// 调用 callback 返回建议列表的数据 empQuery() {
cb(results); this.emp.loading = true;
this.emp.queryParams.tenantId = this.gsInfo.active_id
listEmployeeInfo(this.emp.queryParams).then(response => {
this.emp.list = response.rows;
this.emp.total = response.total;
this.emp.loading = false;
});
}, },
createSaleFilter(queryString) { /** 员工选择弹出框关闭*/
return (sale) => { empCancel() {
return (sale.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0); this.emp.open = false
},
// 员工选择 选中数据
empRowChange(val) {
console.log(this.emp.type,val);
if( this.emp.type===1 ){
this.form.empInfos[this.emp.index].empName = val.name;
this.form.empInfos[this.emp.index].employeeId = val.id;
this.form.empInfos[this.emp.index].deptId = val.deptId;
this.form.empInfos[this.emp.index].deptName = val.deptName;
} }
}, if( this.emp.type===2 ){
handleSaleQuerySelect(item, index) { this.form.dwHoursContrasts[this.emp.index].salesman = val.name;
this.form.dwHoursContrasts[index].salesman = item.name this.form.dwHoursContrasts[this.emp.index].deptId = val.deptId;
}, this.form.dwHoursContrasts[this.emp.index].deptName = val.deptName
handleSaleQueryIconClick(index) {
this.form.dwHoursContrasts[index].salesman = null
} }
this.emp.open = false;
},
} }
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save