src/views/employeeSalary/salaryPlan/index.vue
@@ -50,14 +50,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: "salaryType",min:110 },
        { label: "计费周期", prop: "cycle",min:110 },
        { label: "计费公式定义", prop: "salaryFormula",min:140  },
        { label: "添加时间", prop: "createTime",min:130 },
        { label: "添加人", prop: "addPeople",min:110 },
      ],
      keyword: '',
      editRow:{},
@@ -111,7 +110,18 @@
        .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=workTypeNames+','+item.workTypeNames[i].name
                  }
                }
                return {
                  ...item,
                  workTypeNames:workTypeNames
                }
              })
              this.tableList.tableInfomation = list || []
              this.pagerOptions.totalCount = res.total
            } else {
@@ -130,9 +140,8 @@
    },
    // 新增
    addBtnClick() {
      this.editConfig.infomitton={}
      this.editConfig.dialogTitle="新增"
      this.editConfig.visible=true
      this.editRow = { title:'新建',type:'add' }
      this.$refs.add.islook = true;
    },
    // 搜索
    onFilterSearch(searchText) {
@@ -153,10 +162,6 @@
      this.editRow = { ...config, 
        title:'编辑',
        type:'edit',
        shopNameObj:{
          value:config.shopId,
          label:config.shopName,
        },
        workTypeObj:{
          value:config.workTypeId,
          label:config.workType,