Finish Hotfix-zh-222

src/views/deposit_commerce/deposit_list.vue

@@ -382,12 +382,12 @@
             <el-table-column
               align="right"
               label="押金金额"
-              prop="depositAmount"
+              prop="itemDepositAmount"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed }}
+                {{ scope.row.itemDepositAmount | numToFixed }}
               </template>
             </el-table-column>
 
@@ -625,7 +625,7 @@ export default {
         res.data.records.forEach((item) => {
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
           item.sums1 = ['qty']
-          item.sums2 = ['depositAmount', 'diffAmount', 'price']
+          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price']
         })
         this.listLoading = false
         this.listTotal = res.data.total

src/views/deposit_commerce/refund_list.vue

@@ -313,9 +313,9 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="押金金额" prop="itemDepositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed }}
+                {{ scope.row.itemDepositAmount | numToFixed }}
               </template>
             </el-table-column>
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
@@ -647,7 +647,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.sums1 = [];
-        item.sums2 = ["depositAmount"];
+        item.sums2 = ["itemDepositAmount"];
       });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;

src/views/deposit_home/deposit_list.vue

@@ -406,12 +406,12 @@
             <el-table-column
               align="right"
               label="押金金额"
-              prop="depositAmount"
+              prop="itemDepositAmount"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed }}
+                {{ scope.row.itemDepositAmount | numToFixed }}
               </template>
             </el-table-column>
 
@@ -654,7 +654,7 @@ export default {
         res.data.records.forEach((item) => {
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
           item.sums1 = ['qty']
-          item.sums2 = ['depositAmount', 'diffAmount', 'price']
+          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price']
         })
         this.listLoading = false
         this.listTotal = res.data.total

src/views/deposit_home/refund_list.vue

@@ -312,9 +312,9 @@
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="押金金额" prop="itemDepositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed }}
+                {{ scope.row.itemDepositAmount | numToFixed }}
               </template>
             </el-table-column>
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
@@ -646,7 +646,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.sums1 = [];
-        item.sums2 = ["depositAmount"];
+        item.sums2 = ["itemDepositAmount"];
       });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;

src/views/supply/engin/components/engin_detail.vue

@@ -68,6 +68,10 @@
           <div class="label">固定电话</div>
           <div class="value">{{detailData.tel}}</div>
         </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">文件编号</div>
+          <div class="value">{{detailData.fileNo}}</div>
+        </el-col>
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">{{detailData.installAddress}}</div>

src/views/supply/engin/home_list.vue

@@ -114,7 +114,20 @@
                 <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号"></el-input>
               </el-form-item>
             </el-col>
-
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="购买单位" prop="refBuyUnitName">
+                <el-input v-model="screenForm.refBuyUnitName" placeholder="购买单位"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="保证函" prop="refPromiseProvide">
+                <el-select v-model="screenForm.refPromiseProvide" placeholder="保证函" filterable style="width: 100%">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="未保证" value="未保证"></el-option>
+                  <el-option label="已保证" value="已保证"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="!isCustomer ? 12 : 24" :lg="!isCustomer ? 18 : 24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -176,8 +189,9 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="购买单位" prop="refBuyUnitName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="保证函" prop="refPromiseProvide" min-width="100" show-overflow-tooltip></el-table-column>
-            
+
             <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
@@ -243,7 +257,7 @@
             <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="110" sortable show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="出库数量" prop="hasSendQty" min-width="110" sortable show-overflow-tooltip></el-table-column>
 
-            
+
             <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip></el-table-column>
@@ -409,7 +423,9 @@ export default {
         refRegionWork: '',
         remark: '',
         geLiInerNote: '',
-        refFactoryNo: ''
+        refFactoryNo: '',
+        refBuyUnitName: '',
+        refPromiseProvide: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -462,6 +478,8 @@ export default {
         remark: this.screenForm.remark,
         geLiInerNote: this.screenForm.geLiInerNote,
         refFactoryNo: this.screenForm.refFactoryNo,
+        refBuyUnitName: this.screenForm.refBuyUnitName,
+        refPromiseProvide: this.screenForm.refPromiseProvide,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       }
     },
@@ -528,6 +546,8 @@ export default {
         remark: this.screenForm.remark,
         geLiInerNote: this.screenForm.geLiInerNote,
         refFactoryNo: this.screenForm.refFactoryNo,
+        refBuyUnitName: this.screenForm.refBuyUnitName,
+        refPromiseProvide: this.screenForm.refPromiseProvide,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       };
       getOrderList(params).then((res) => {

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

@@ -24,7 +24,6 @@
               placeholder="销售政策编号"
             ></el-input>
           </el-form-item>
-
         </el-col> -->
         <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
           <el-form-item label="单据日期" prop="date">
@@ -1075,6 +1074,7 @@ export default {
         let arrData = []
         for (let i = 0; i < this.multipleData.length; i++) {
           if (this.multipleData[i].wallets && this.multipleData[i].wallets.length) {
+            this.multipleData[i].id = null
             this.$set(this.multipleData[i], 'customerWalletId', this.multipleData[i].wallets[0].customerWalletId)
             this.$set(this.multipleData[i], 'serviceName', this.multipleData[i].wallets[0].serviceName)
             this.$set(this.multipleData[i], 'serviceId', this.multipleData[i].wallets[0].serviceId)
@@ -1129,6 +1129,8 @@ export default {
         for (let i = 0; i < this.multipleSelections.length; i++) {
           for (let j = 0; j < this.multipleSelections[i].length; j++) {
             this.multipleSelections[i][j].disabled = true
+            this.multipleSelections[i][j].id = null
+
             if (this.multipleSelections[i][j].wallets.length) {
               this.$set(this.multipleSelections[i][j], 'customerWalletId', this.multipleSelections[i][j].wallets[0].customerWalletId)
               this.$set(this.multipleSelections[i][j], 'serviceName', this.multipleSelections[i][j].wallets[0].serviceName)
@@ -1556,7 +1558,8 @@ export default {
           //   this.typeList[
           //     findElem(this.typeList, "dictCode", this.mainForm.type)
           //   ].dictValue;
-
+          delete  this.goodsList.userList
+      
           const params = {
             theTime: this.mainForm.date,
             k3ServiceId: this.mainForm.k3ServiceId,
@@ -1569,6 +1572,7 @@ export default {
           }
           console.log(params)
           if (this.listItem) {
+            console.log(params.listItem);
             params.id = this.listItem.id
             editData(params).then((res) => {
               this.$successMsg('编辑成功')
@@ -1576,6 +1580,9 @@ export default {
               this.$parent.getList()
             })
           } else {
+            params.retailOrderItemList.forEach(k=>{
+              k.id = null
+            })
             addData(params).then((res) => {
               this.$successMsg('添加成功')
               this.goBack()