修改bug

src/enums/column-name.js

@@ -463,6 +463,10 @@ const columnName = [{
   {
     code: 123,
     name: '经销商产品调拨商品弹窗'
+  },
+  {
+    code: 124,
+    name: '交接单附件上传'
   }
 ]
 export const getColumnName = (key) => {

src/views/approval/processConfig/index.vue

@@ -444,6 +444,8 @@ export default {
         }
         userList(params).then(res => {
           this.$set(row, 'userList', res.data.data);
+          // 选完角色部门默认全部带上
+          this.$set(row, 'auditUserId', res.data.data.map(item => item = item.id));
         })
       } else {
         this.$set(row, 'userList', [])

src/views/maintenance/integral/config/mainList.json

@@ -32,7 +32,7 @@
       "label": "客户",
       "prop": "corpId",
       "search": true,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -49,7 +49,7 @@
       "label": "积分",
       "prop": "inPoints",
       "search": false,
-      "index": 2,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -59,7 +59,7 @@
       "label": "兑换",
       "prop": "outPoints",
       "search": false,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -67,7 +67,7 @@
       "label": "积分余额",
       "prop": "balancePoints",
       "search": false,
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8

src/views/maintenance/overpayment/config/mainList.json

@@ -32,7 +32,7 @@
       "label": "客户",
       "prop": "corpId",
       "search": true,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -40,7 +40,7 @@
       "label": "增加",
       "prop": "inOverpayment",
       "search": false,
-      "index": 2,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -48,7 +48,7 @@
       "label": "使用",
       "prop": "outOverpaymen",
       "search": false,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -56,7 +56,7 @@
       "label": "余额",
       "prop": "balanceOverpaymen",
       "search": false,
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8

src/views/maintenance/rebate/config/mainList.json

@@ -32,7 +32,7 @@
       "label": "客户",
       "prop": "cname",
       "search": true,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -40,7 +40,7 @@
       "label": "总返利",
       "prop": "profitReturn",
       "search": false,
-      "index": 2,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -50,7 +50,7 @@
       "label": "已用返利",
       "prop": "usedProfit",
       "search": false,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -58,7 +58,7 @@
       "label": "可用返利",
       "prop": "surplusProfit",
       "search": false,
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -66,7 +66,7 @@
       "label": "本月待到账",
       "prop": "monthProfit",
       "search": false,
-      "index": 4,
+      "index": 6,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -174,6 +174,7 @@
                 size="small"
                 @click="rowCell(row, index)"
                 icon="el-icon-edit"
+                :disabled="form.status == 0"
               >{{ row.$cellEdit ? "保存" : "修改" }}
               </el-button>
               <el-button

src/views/maintenance/salesPolicy/index.vue

@@ -53,6 +53,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row,scope.index)"
+            :disabled="scope.row.status == 0"
           >删除
           </el-button>
         </template>

src/views/reimbursement/detail.vue

@@ -187,7 +187,7 @@
               @clear="row.feeList = feesOption"
               placeholder="请选择"
             ></avue-cascader>
-            <span v-else>{{ row.mold }}</span>
+            <span v-else="!row.$cellEdit">{{ row.mold }}</span>
           </template>
           <template slot="detailId" slot-scope="{ row }">
             <el-select
@@ -509,7 +509,8 @@ export default {
         this.form = res.data.data;
         this.dataList = this.form.itemList? this.form.itemList: [];
         this.dataList.forEach(item => {
-          this.moldChange(item.moldId, item, this.dicArea, false)
+          this.moldChange(item.moldId, item, this.dicArea)
+          item.payMethod = item.payMethod.toString();
         })
         this.oldForm = {...this.form};
         this.oldDataList = [...this.dataList];
@@ -713,13 +714,10 @@ export default {
     onClose(val) {
       this.switchDialog = val;
     },
-    moldChange(e, row, list, remove = true) {
-      if (remove && row.moldId != e) {
-        this.$set(row, 'detailId', null);
-      }
+    moldChange(e, row, list) {
       list.forEach(item => {
         if (e == item.value) {
-          this.$set(row, 'mold', item.title)
+          this.$set(row, 'mold', item.title);
           getFeesList({size: 10, current: 1,feesTypeId: e}).then(res => {
             this.$set(row, 'feeList', res.data.data.total > 0? res.data.data.records: []);
             if (Math.ceil(res.data.data.total / 10) > 1) {
@@ -728,12 +726,22 @@ export default {
                   row.feeList = row.feeList.concat(e.data.data.records);
                 });
               }
+              this.$nextTick(() => {
+                if (!(row.feeList.some(item => item.id == row.detailId))) {
+                  this.$set(row, 'detailId', null);
+                }
+              })
+            } else {
+              this.$nextTick(() => {
+                if (!(row.feeList.some(item => item.id == row.detailId))) {
+                  this.$set(row, 'detailId', null);
+                }
+              })
             }
           });
         }
-
         if (item.hasChildren) {
-          this.moldChange(e, row, item.children, false)
+          this.moldChange(e, row, item.children)
         }
       })
     },