fix:修复纤度登记表，检验表，产量等级表部分的bug修复

charles

2024-07-15 c77637aa6781f3275839674cb4fa2d4b72b8827c

 src/views/employeeSalary/salaryPlan/index.vue

@@ -12,10 +12,9 @@
        <TableCommonView
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="180">
            <el-table-column label="操作" width="110">
              <template slot-scope="scope">
                <el-button @click.stop="handleClick(scope.row)" type="text" size="small">修改</el-button>
                <el-button @click.stop="delClick(scope.row)" type="text" size="small">删除</el-button>
@@ -25,12 +24,12 @@
          </template>
        </TableCommonView>
      </div>
      <AddDialog 
      ref="add" :editRow="editRow"  @refresh="refresh" 
      />
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
      </div>
      <AddDialog 
      ref="add" :editRow="editRow"  @refresh="refresh" 
      />
    </div>
  </div>
</template>
@@ -50,14 +49,13 @@
      tableList: {},
      showCol: ["方案名称", "工种", "薪资类型", "计费周期", "计费公式定义", "添加时间", "添加人"],
      tableColumn: [
        // { label: "车间", prop: "workshopNumber",iconRight:"el-icon-setting"},
        { label: "方案名称", prop: "workshopNumber",min:110},
        { label: "工种", prop: "groupNumber",min:100 },
        { label: "薪资类型", prop: "startCarNumber",min:110 },
        { label: "计费周期", prop: "endCarNumber",min:110 },
        { label: "计费公式定义", prop: "carFlag",min:140  },
        { label: "添加时间", prop: "notes",min:130 },
        { label: "添加人", prop: "notes",min:110 },
        { label: "方案名称", prop: "name",min:110},
        { label: "工种", prop: "workTypeNames",min:100 },
        { label: "薪资类型", prop: "salaryTypeName",min:110 },
        { label: "计费周期", prop: "cycle",min:110 },
        { label: "计费公式定义", prop: "salaryFormulaValue",min:140  },
        { label: "添加时间", prop: "createTime",min:130 },
        { label: "添加人", prop: "addPeople",min:110 },
      ],
      keyword: '',
      editRow:{},
@@ -111,7 +109,22 @@
        .then((res) => {
          if (res.code === 200) {
            if (res.data) {
              const list = res.data
              const list = res.data.map(item=>{
                let workTypeNames=''
                if(item.workTypes){
                  for(let i in item.workTypes){
                    workTypeNames=item.workTypes[i].workName+','+workTypeNames
                  }
                }
                let salaryFormulaValue=''
                salaryFormulaValue=item.salaryFormula?item.salaryFormula.split(",").join(''):[]
                return {
                  ...item,
                  workTypeNames:workTypeNames,
                  salaryFormulaValue:salaryFormulaValue,
                  salaryTypeName:item.salaryType?item.salaryType.name:''
                }
              })
              this.tableList.tableInfomation = list || []
              this.pagerOptions.totalCount = res.total
            } else {
@@ -130,9 +143,8 @@
    },
    // 新增
    addBtnClick() {
      this.editConfig.infomitton={}
      this.editConfig.dialogTitle="新增"
      this.editConfig.visible=true
      this.editRow = { title:'新建',type: 'add' }
      this.$refs.add.islook = true;
    },
    // 搜索
    onFilterSearch(searchText) {
@@ -143,24 +155,25 @@
    refresh(){
      this.getData()
    },
    // 表格行点击
    tableRowClick(row) {
      console.log(row, "row")
    },
    // 编辑
    handleClick(row) {
      let config=JSON.parse(JSON.stringify(row));
      this.editRow = { ...config, 
      let arr=config.workTypes?config.workTypes:[]
      let workTypes=[]
      if(arr&&arr.length>0){
        for(let i in arr){
          workTypes.push({
            value:arr[i].ID,
            label: arr[i].workName
          })
        }
      }
      this.editRow = { 
        ...config, 
        title:'编辑',
        type:'edit',
        shopNameObj:{
          value:config.shopId,
          label:config.shopName,
        },
        workTypeObj:{
          value:config.workTypeId,
          label:config.workType,
        } 
        id:config.ID,
        workTypes:workTypes
      }
      this.$refs.add.islook = true;
    },
@@ -172,7 +185,7 @@
        type: "warning"
      })
        .then(() => {
          deleteSalaryPlanInfo({ id: row.id }).then((response) => {
          deleteSalaryPlanInfo({ id: row.ID }).then((response) => {
            if (response.code === 200) {
              this.$message.success("删除成功")
              this.getData()