日工工时页面修改

ruoyi-ui/src/views/pay/dayWorkHours/index.vue

@@ -129,6 +129,13 @@
               @click="handleUpdate(scope.row)"
               v-hasPermi="['pay:dayWorkHours:edit']"
             >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleDetails(scope.row)"
+              v-hasPermi="['pay:dayWorkHours:query']"
+            >详情</el-button>
             <el-button
               size="mini"
               type="text"
@@ -170,8 +177,8 @@
             <el-form-item
               label="员工姓名"
               :prop="'empInfos.' + index + '.empName'"
-              :rules="{required: true, message: '员工姓名不能为空', trigger: 'blur'}">
+              :rules="{required: true, message: '员工姓名不能为空', trigger: ['blur', 'change']}">
-              <el-input placeholder="请选择员工姓名" readonly v-model="elctment.empName" @focus="changeEmp(elctment, index,1)">
+              <el-input placeholder="请选择员工姓名" readonly v-model="elctment.empName" @focus="changeEmp(index,1)">
                 <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
               </el-input>
             </el-form-item>
@@ -180,7 +187,7 @@
             <el-form-item
               label="部门名称"
               :prop="'empInfos.' + index + '.deptId'"
-              :rules="{required: true, message: '员工姓名不能为空', trigger: 'blur'}">
+              :rules="{required: true, message: '员工姓名不能为空', trigger: ['blur', 'change']}">
               <treeselect v-model="elctment.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width: 200px" @select="changeDept"/>
             </el-form-item>
           </el-col>
@@ -218,7 +225,94 @@
             <el-form-item
               label="业务员"
               :prop="'dwHoursContrasts.' + index + '.salesman'">
-              <el-input placeholder="请选择业务员" readonly v-model="domain.salesman" @focus="changeEmp(domain, index,2)">
+              <el-input placeholder="请选择业务员" readonly v-model="domain.salesman" @focus="changeEmp(index,2)">
+                <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+              </el-input>
+            </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="请选择归属部门" @select="changeDept1($event,domain)" style="width: 200px"/>
+            </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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-button size="mini" @click="addDomain">新增时间段</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog class="my-dialog" :title="title" :visible.sync="opena" width="1200px" 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-col :span="8">
+            <el-form-item label="员工姓名" prop="empName">
+              <el-input placeholder="请选择员工姓名" readonly v-model="form.empName" @focus="changeEmp(index,1)">
+                <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+              </el-input>
+            </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="changeDept"/>
+            </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-input placeholder="请选择业务员" readonly v-model="domain.salesman" @focus="changeEmp(index,2)">
                 <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
               </el-input>
             </el-form-item>
@@ -237,7 +331,7 @@
             <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"/>
+              <treeselect v-model="domain.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" @select="changeDept1($event,domain)" style="width: 200px"/>
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
@@ -254,8 +348,81 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" v-if="title === '日工工时详情'">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="员工姓名" prop="empName">
+              <el-select v-model="form.empName" filterable clearable placeholder="请选择" disabled>
+                <el-option
+                  v-for="item in form.employeeList"
+                  :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="changeDept" 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-input placeholder="请选择业务员" readonly v-model="domain.salesman" @focus="changeEmp(index,2)">
+                <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
+              </el-input>
+            </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" disabled>
+                <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="请选择归属部门" disabled @select="changeDept1($event,domain)" style="width: 200px"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="title !== '日工工时详情'">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -353,6 +520,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      opena: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -527,24 +695,19 @@ export default {
       const id = row.id || this.ids
       getDayWorkHours(id).then(response => {
         this.form = response.data;
-        /*getEmpNameList().then(response => {
+        this.form.dwHoursContrasts.forEach(item => {
-          this.$set(this.form,'employeeList',response.data)
+          // this.$set(item,'departOptions',response.data)
-        })*/
+          var sth = new Date(item.startTime).getHours();
-        /*treeselect().then(response => {
+          sth = sth < 10 ?  sth : sth;
-          this.form.dwHoursContrasts.forEach(item => {
+          var stm = new Date(item.startTime).getMinutes();
-            this.$set(item,'departOptions',response.data)
+          stm = stm < 10 ? '0' + stm : stm;
-            var sth = new Date(item.startTime).getHours();
+          var eth = new Date(item.endTime).getHours();
-            sth = sth < 10 ?  sth : sth;
+          eth = eth < 10 ?  eth : eth;
-            var stm = new Date(item.startTime).getMinutes();
+          var etm = new Date(item.endTime).getMinutes();
-            stm = stm < 10 ? '0' + stm : stm;
+          etm = etm < 10 ? '0' + etm : etm;
-            var eth = new Date(item.endTime).getHours();
+          this.$set(item,"beginTime",sth+":"+stm);
-            eth = eth < 10 ?  eth : eth;
+          this.$set(item,"fnishTime",eth+":"+etm);
-            var etm = new Date(item.endTime).getMinutes();
+        })
-            etm = etm < 10 ? '0' + etm : etm;
-            this.$set(item,"beginTime",sth+":"+stm);
-            this.$set(item,"fnishTime",eth+":"+etm);
-          })
-        })*/
         this.opena = true;
         this.title = "修改日工工时";
       });
@@ -553,29 +716,9 @@ export default {
     changeDept(dept) {
       this.form.deptName = dept.label
     },
-    getSummaries(param) {
+    /** 查询时选择部门 */
-      const { columns, data } = param;
+    changeDept1(dept,item) {
-      const sums = [];
+      item.deptName = dept.label
-      var sum = 0
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '总小时数';
-          return;
-        }
-        if (column.property == 'hours') {
-          data.forEach(item => {
-            item.dwHoursContrasts.forEach(hour => {
-              if(hour.hours != null){
-                sum += Number(hour.hours);
-                sums[index] = parseFloat(sum).toFixed(2);
-              }
-            })
-          })
-        } else {
-          sums[index] = '';
-        }
-      });
-      return sums;
     },
     /** 查询时选择员工 */
     getEmploy(val) {
@@ -586,52 +729,11 @@ export default {
         }
       })
     },
-    /** 新增或修改时选择员工 */
-    getEmployee(val, index) {
-      this.form.employeeList.forEach(employee => {
-        if (employee.id == val) {
-          this.form.employeeId = employee.id;
-          this.form.empName = employee.name;
-          this.form.deptName = employee.deptName;
-          this.form.deptId = employee.deptId;
-          this.form.empInfos[index].employeeId = employee.id;
-          this.form.empInfos[index].empName = employee.name;
-          this.form.empInfos[index].deptName = employee.deptName;
-          this.form.empInfos[index].deptId = employee.deptId;
-        }
-      })
-    },
-    /** 查询时选择部门 */
-    currDeptChange(dept) {
-      this.form.deptName = dept.label
-    },
     getHelpers() {
-      treeselect().then(response => {
+      this.form.dwHoursContrasts.forEach(item => {
-        this.form.dwHoursContrasts.forEach(item => {
+        if(0 == item.isHelper){
-          if(0 == item.isHelper){
+          item.deptId = null
-            item.departOptions = []
+          item.deptName = null
-            item.deptId = null
-            item.deptName = null
-          } else {
-            // item.departOptions = response.data[0].children;
-            item.departOptions = response.data;
-          }
-        })
-      })
-    },
-    currDepartChange(val, i) {
-      this.form.dwHoursContrasts[i].deptName = val.label
-    },
-    //查询业务员
-    handleSalelist() {
-      getSalelist().then(response => {
-        this.saleList = response
-      })
-    },
-    getSalemanList(val) {
-      this.saleList.forEach(sal => {
-        if(sal.id == val){
-          this.queryParams.salesman = sal.name
         }
       })
     },
@@ -712,29 +814,23 @@ export default {
     handleDetails(row) {
       this.reset();
       const id = row.id || this.ids
-      /*getDwhours(id).then(response => {
+      getDayWorkHours(id).then(response => {
         this.form = response.data;
-        getEmpNameList().then(response => {
+        this.form.dwHoursContrasts.forEach(item => {
-          this.$set(this.form,'employeeList',response.data)
+          var sth = new Date(item.startTime).getHours();
-        })
+          sth = sth < 10 ?  sth : sth;
-        treeselect().then(response => {
+          var stm = new Date(item.startTime).getMinutes();
-          this.form.dwHoursContrasts.forEach(item => {
+          stm = stm < 10 ? '0' + stm : stm;
-            this.$set(item,'departOptions',response.data)
+          var eth = new Date(item.endTime).getHours();
-            var sth = new Date(item.startTime).getHours();
+          eth = eth < 10 ?  eth : eth;
-            sth = sth < 10 ?  sth : sth;
+          var etm = new Date(item.endTime).getMinutes();
-            var stm = new Date(item.startTime).getMinutes();
+          etm = etm < 10 ? '0' + etm : etm;
-            stm = stm < 10 ? '0' + stm : stm;
+          this.$set(item,"beginTime",sth+":"+stm);
-            var eth = new Date(item.endTime).getHours();
+          this.$set(item,"fnishTime",eth+":"+etm);
-            eth = eth < 10 ?  eth : eth;
-            var etm = new Date(item.endTime).getMinutes();
-            etm = etm < 10 ? '0' + etm : etm;
-            this.$set(item,"beginTime",sth+":"+stm);
-            this.$set(item,"fnishTime",eth+":"+etm);
-          })
         })
         this.opena = true;
         this.title = "日工工时详情";
-      });*/
+      });
     },
     /** 提交按钮 */
     submitForm() {
@@ -779,7 +875,7 @@ export default {
       });
     },
     // 添加包活派工单 选择员工
-    changeEmp(val,index,type){
+    changeEmp(index,type){
       this.emp.open = true;
       this.emp.index = index;
       this.emp.type = type;
@@ -811,8 +907,6 @@ export default {
       }
       if( this.emp.type===2 ){
         this.form.dwHoursContrasts[this.emp.index].salesman = val.name;
-        this.form.dwHoursContrasts[this.emp.index].deptId = val.deptId;
-        this.form.dwHoursContrasts[this.emp.index].deptName = val.deptName
       }
       this.emp.open = false;
     },