Merge tag 'Hotfix-zh-60' into develop

Finish Hotfix-zh-60

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -496,7 +496,7 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="projectList"
+            :data="goodsList"
             element-loading-text="Loading"
             border
             fit
@@ -566,7 +566,7 @@
     <div v-show="engineering == '直调发货'" class="zd">
       <div class="table" style="margin-top: 20px">
         <el-table
-          :data="goodsList"
+          :data="projectList"
           element-loading-text="Loading"
           border
           fit
@@ -704,7 +704,7 @@ export default {
         }).then((res) => {
           this.dataList = res.data
         })
-      } else if (this.engineering == '直调发货') {
+      } else if (this.engineering == '工程发货信息') {
         getList({
           pageSize: -1,
           pageNum: 1,
@@ -716,6 +716,7 @@ export default {
         getListProject({
           pageSize: -1,
           pageNum: 1,
+          type:3,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
           examineStatus: 'OK'
         }).then((res) => {

src/views/sales_policy/components/AddCondition.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container class="app-container">
+  <el-container >
     <el-header height="50px" class="header">
       <el-page-header @back="handleBack" :content="!id ? '新增' : '详情页面'">
       </el-page-header>

src/views/sales_policy/components/AddPolicy.vue

@@ -395,7 +395,7 @@
                 <el-button
                   type="text"
                   size="small"
-                  @click="scope.row.fang = false"
+                  @click="scope.row.fang = false;conditName=scope.row.name"
                 >编辑</el-button>
                 <el-button
                   type="text"
@@ -515,6 +515,7 @@ export default {
           label: '限量'
         }
       ],
+      conditName:'',
       conditionList: [],
       dictList: [],
       k3List: [],
@@ -670,10 +671,12 @@ export default {
     // 修改条件名称
     handleConditionName(row) {
       console.log(row.name)
-      updateCondition({ id: row.id, name: row.name }).then((res) => {
-        this.$successMsg('修改成功')
-        row.fang = true
-      })
+      if (this.conditName !== row.name){
+        updateCondition({ id: row.id, name: row.name }).then((res) => {
+          this.$successMsg('修改成功')
+        })
+      }
+      row.fang = true
     },
     // 提交信息
     handleSubmitCon() {

src/views/sales_policy/components/Examine.vue

@@ -512,7 +512,7 @@
           </template>
           <div
             v-if="$parent.isShow == 8 && detail.examineStatus == 'WAIT'"
-            class="descriptions"
+            class="descriptions diy-table-1"
           >
             <el-row>
               <el-col :span="6">审核人</el-col>
@@ -527,9 +527,9 @@
                 </template>
               </el-col>
             </el-row>
-            <el-row>
+            <el-row  class="item">
               <el-col :span="4">审批说明</el-col>
-              <el-col :span="20" class="col value" style="padding: 0">
+              <el-col :span="20" class="col value" style="padding-left: 10px">
                 <el-input
                   v-model="remark"
                   size="small"

src/views/sales_policy/components/TabelTransfer.vue

@@ -348,8 +348,8 @@ export default {
     getCond() {
       this.listLoading = true
       const custoParams = {
-        pageNum: this.currentPages,
-        pageSize: this.pageSizes,
+        pageNum: 1,
+        pageSize: -1,
         policyId: this.comCode || this.code
       }
       getCustomerList(custoParams).then((res) => {

src/views/sales_policy/components/editPolicy.vue

@@ -402,7 +402,7 @@
                 <el-button
                   type="text"
                   size="small"
-                  @click="scope.row.fang = false"
+                  @click="scope.row.fang = false; conditName=scope.row.name"
                 >编辑</el-button>
                 <el-button
                   type="text"
@@ -500,6 +500,7 @@ export default {
         mainName: '',
         type: ''
       },
+      conditName:'',
       dataList: [],
       addList: [],
       pageSizeArr: [10, 20, 30, 50],
@@ -675,10 +676,12 @@ export default {
     // 修改条件名称
     handleConditionName(row) {
       console.log(row.name)
-      updateCondition({ id: row.id, name: row.name }).then((res) => {
-        this.$successMsg('修改成功')
-        row.fang = true
-      })
+      if (this.conditName !== row.name){
+        updateCondition({ id: row.id, name: row.name }).then((res) => {
+          this.$successMsg('修改成功')
+        })
+      }
+      row.fang = true
     },
     // 提交信息
     handleSubmitCon() {