Browse Source

每月工资信息和考勤信息人员id调整为unicode

ljb 10 months ago
parent
commit
31faef8dc5

+ 1 - 23
src/option/yfCostManage/basicDataSetting/monthSalaryList.js

@@ -33,31 +33,9 @@ export default {
       search: true,
       width: 75,
       align: 'center',
-      type: 'select',
       searchType: 'input',
       showOverflowTooltip: true,
-      dicFlag: true,
-      editDisabled: true,
-      dicUrl: '',
-      dicFormatter:(res)=>{     
-        return res.data.records
-      },
-      dicQuery: {
-        current: 1,
-        size: 99999,
-        yearAndMonth: ''
-      },
-      props: {
-        label: 'name',
-        value: 'id',
-      },
-      rules: [
-        {
-          required: true,
-          message: '请选择技术人员',
-          trigger: 'blur',
-        },
-      ],
+      disabled: true,
     },
     {
       label: '工号',

+ 1 - 22
src/views/yf-cost-manage/basic-data-setting/atten-info.vue

@@ -43,18 +43,6 @@
           <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
         </div>
       </template>
-
-      <!-- <template slot="technicianId" slot-scope="{ row }">
-        <span>{{ row.name }}</span>
-      </template>
-
-      <template slot="gsTotalSearch">
-        <div style="display: flex; align-items: center;">
-          <avue-input-number v-model="params.gsTotalStart" :min="0"></avue-input-number>
-          <span style="width: 70px; text-align: center;">至</span>
-          <avue-input-number v-model="params.gsTotalEnd" :min="0"></avue-input-number>
-        </div>
-      </template> -->
       
     </avue-crud>
 
@@ -113,15 +101,6 @@ export default window.$crudCommon({
     this.option.column = deepClone(this.defaultColumns);
   },
   methods: {
-    // handleBeforeOpen(done, type) {
-    //   this.option.column.forEach(item => {
-    //     if (item.prop == "technicianId") {
-    //       item.dicUrl = '/api/kd-scientific/technician/page';
-    //       item.dicQuery.yearAndMonth = this.params.yearAndMonth;
-    //     }
-    //   });
-    //   done();
-    // },
     refreshTableCol(yearAndMonth) {
       let yearMonth = moment(yearAndMonth).format("YYYY-MM").split("-");
       const monthDays = getMonthDatesWithMarkers(Number(yearMonth[0]), Number(yearMonth[1]));
@@ -225,7 +204,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     let newList = [];
     data.records.forEach((item) => {
-      let objData = { ...item, id: item.technicianId };
+      let objData = { ...item, unicode: item.technicianId };
       item.dailyAttendances.forEach(hourItem => {
         objData[hourItem.workDate] = (hourItem.workHours || 0).toFixed(1);
       });

+ 3 - 9
src/views/yf-cost-manage/basic-data-setting/month-salary-list.vue

@@ -151,12 +151,6 @@ export default window.$crudCommon({
     handleBeforeOpen(done, type) {
       this.operateType = type;
       this.beforeUpdatedData = { ...this.form };
-      this.option.column.forEach(item => {
-        if (item.prop == "name") {
-          item.dicUrl = '/api/kd-scientific/technician/page';
-          item.dicQuery.yearAndMonth = this.params.yearAndMonth;
-        }
-      });
       done();
     },
     getFormData() {
@@ -173,20 +167,20 @@ export default window.$crudCommon({
         }
       });
       this.updatedFormData = {
-        technicianId: this.form.technicianId,
         yearAndMonth: this.params.yearAndMonth,
+        unicode: this.form.unicode,
         ...updatedData
       };
       callback && callback();
     },
     getDelParams(row) {
-      return [{ yearAndMonth: this.params.yearAndMonth, technicianId: row.technicianId }]
+      return [{ yearAndMonth: this.params.yearAndMonth, unicode: row.unicode }]
     },
     getBatchDelParams() {
       let delArr = [];
       this.data.forEach(item => {
         if (this.ids.indexOf(item.id) > -1) {
-          delArr.push({ yearAndMonth: this.params.yearAndMonth, technicianId: item.technicianId });
+          delArr.push({ yearAndMonth: this.params.yearAndMonth, unicode: item.unicode });
         }
       });
       return delArr;