Finish Hotfix-zh-54

src/views/basic_data/material/components/modify_list-apply.vue

@@ -806,9 +806,9 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionChange"
           >
+<!--            :selectable="selectable"-->
             <el-table-column
               align="center"
-              :selectable="selectable"
               type="selection"
               width="55"
             />
@@ -1347,17 +1347,17 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function(row, index) {
-      // row.disabled == undefined 才能被选中
-      if (row.disabled == undefined || row.disabled == false) {
-        return true
-      } else {
-        return false
-      }
-      // 函数必须有返回值且是布尔值
-      // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
-      // 如果没有返回值则默认返回false(全部无法选中)
-    },
+    // selectable: function(row, index) {
+    //   // row.disabled == undefined 才能被选中
+    //   if (row.disabled == undefined || row.disabled == false) {
+    //     return true
+    //   } else {
+    //     return false
+    //   }
+    //   // 函数必须有返回值且是布尔值
+    //   // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
+    //   // 如果没有返回值则默认返回false(全部无法选中)
+    // },
     hanleSbumit() {
       this.filterWallets(this.items)
       const params = {
@@ -1507,28 +1507,28 @@ export default {
           result.data[i].rebateList = rebateList
           result.data[i].fang = false
         }
-        if (this.dataList.length) {
-          for (let j = 0; j < result.data.length; j++) {
-            for (let k = 0; k < this.dataList.length; k++) {
-              if (result.data[j].materialId === this.dataList[k].id) {
-                this.dataList[k].disabled = true
-              }
-            }
-          }
-        }
+        // if (this.dataList.length) {
+        //   for (let j = 0; j < result.data.length; j++) {
+        //     for (let k = 0; k < this.dataList.length; k++) {
+        //       if (result.data[j].materialId === this.dataList[k].id) {
+        //         this.dataList[k].disabled = true
+        //       }
+        //     }
+        //   }
+        // }
 
 
+        // this.items = [...this.items,...result.data]
+        // let newArr = [];
+        // let obj = {};
+        // for (var i = 0; i < this.items.length; i++) {
+        //   if (!obj[this.items[i].materialId]) {
+        //     newArr.push(this.items[i])
+        //     obj[this.items[i].materialId] = true
+        //   }
+        // }
+        // console.log(newArr,454 ,obj)
         this.items = [...this.items,...result.data]
-        let newArr = [];
-        let obj = {};
-        for (var i = 0; i < this.items.length; i++) {
-          if (!obj[this.items[i].key]) {
-            newArr.push(this.items[i])
-            obj[this.items[i].key] = true
-          }
-        }
-        console.log(newArr,454)
-        this.items = newArr
         // console.log(resArrs(result.data,this.dataList),'55555')
 
       } else {

src/views/basic_data/material/price_list.vue

@@ -114,7 +114,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fr">
-        <el-button type="primary" size="small">导出</el-button>
+<!--        <el-button type="primary" size="small">导出</el-button>-->
         <!-- <el-button type="primary" size="small">打印</el-button> -->
       </div>
     </div>
@@ -129,7 +129,7 @@
           fit
           stripe
         >
-          <el-table-column type="selection" align="center" />
+<!--          <el-table-column type="selection" align="center" />-->
           <!-- <el-table-column
             align="center"
             label="产品品类"

src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -506,6 +506,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.aaa {
+  height: 64px;
+  width: 64px;
+}
+.gdzl {
+  display: inline-block;
+}
 ::v-deep .textareaStyle {
   .el-textarea__inner {
     resize: none;

src/views/supply/policy/components/retail_form.vue

@@ -68,7 +68,7 @@
             <el-select
               v-model="mainForm.k3ServiceName"
               placeholder="选择业务员"
-              disabled
+
               style="width: 100%"
               @change="handleUser"
             >
@@ -264,32 +264,32 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="业务员"
-          prop="retiredQty"
-          min-width="160"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.serviceName"
-              size="small"
-              disabled
-              placeholder="选择业务员"
-
-              style="width: 100%"
-              @change="handleUser2($event,scope.row)"
-            >
-              <el-option
-                v-for="item in scope.row.userList"
-                :key="item.adminUserId"
-                :label="item.nickName"
-                :value="item.adminUserId"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          align="center"-->
+<!--          label="业务员"-->
+<!--          prop="retiredQty"-->
+<!--          min-width="160"-->
+<!--          show-overflow-tooltip-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select-->
+<!--              v-model="scope.row.serviceName"-->
+<!--              size="small"-->
+<!--              disabled-->
+<!--              placeholder="选择业务员"-->
+
+<!--              style="width: 100%"-->
+<!--              @change="handleUser2($event,scope.row)"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in scope.row.userList"-->
+<!--                :key="item.adminUserId"-->
+<!--                :label="item.nickName"-->
+<!--                :value="item.adminUserId"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
           align="center"
           label="实付金额"
@@ -385,7 +385,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
@@ -1399,9 +1399,10 @@ export default {
           this.mainForm.remark = data.remark
           this.mainForm.policyId = data.policyId
           this.policyId = data.policyId
-
-          this.mainForm.k3ServiceName = data.retailOrderItemList[0].wallets[0].serviceName
-          this.mainForm.k3ServiceId = data.retailOrderItemList[0].wallets[0].serviceId
+          this.mainForm.k3ServiceName = data.k3ServiceName
+          this.mainForm.k3ServiceId = data.k3ServiceId
+          // this.mainForm.k3ServiceName = data.retailOrderItemList[0].wallets[0].serviceName
+          // this.mainForm.k3ServiceId = data.retailOrderItemList[0].wallets[0].serviceId
           data.retailOrderItemList.forEach((item) => {
             item.status1 = ''
             item.status2 = ''