Merge tag 'Hotfix-zh-57' into develop

Finish Hotfix-zh-57

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

@@ -27,7 +27,7 @@
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">经销商编码</div>
-            <div class="value">{{ details.customerId }}</div>
+            <div class="value">{{ details.customerNumber }}</div>
           </el-col>
 
           <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -68,14 +68,11 @@
             <div class="label">工程差价总额</div>
             <div class="value">{{ details.depositDiffAmount }}</div>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <el-col :xs="24" :sm="24" :lg="16" class="item">
             <div class="label">使用单位</div>
             <div class="value">{{ details.refUseUnit }}</div>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label" />
-            <div class="value" />
-          </el-col>
+
           <el-col :xs="24" :sm="24" :lg="24" class="item">
             <div class="label">安装时间</div>
             <div class="value" style="padding: 0">

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

@@ -34,7 +34,7 @@
             </el-col>
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">经销商编码</div>
-              <div class="value">{{ details.customerId }}</div>
+              <div class="value">{{ details.customerNumber }}</div>
             </el-col>
 
             <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -94,6 +94,13 @@
                 </el-form-item>
               </div>
             </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">安装地址</div>
+              <div class="value">
+                {{details.refInstallAddress}}
+              </div>
+            </el-col>
+
             <!--            <el-col :xs="24" :sm="24" :lg="8" class="item">-->
             <!--              <div class="label">寄厂日期</div>-->
             <!--              <div class="value" style="padding: 0">-->

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

@@ -880,8 +880,7 @@ export default {
           const params = {
             orderNo: this.listItem.id,
             orderDate: this.deliverForm.date + ' 00:00:00',
-            correspondId: this.deliverForm.warehouse,
-            stockId: this.deliverForm.position,
+            correspondId: this.deliverForm.position,
             directItems: goodsList
           }
           adjustDeliver(params).then((res) => {

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

@@ -217,6 +217,7 @@
             </el-select>
           </template>
         </el-table-column>
+
         <el-table-column
           align="center"
           label="返利金额"
@@ -292,6 +293,19 @@
         <!--        </el-table-column>-->
         <el-table-column
           align="center"
+          label="可用返利"
+          prop="amount"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.amount | numToFixed }}</div>
+
+          </template>
+
+        </el-table-column>
+        <el-table-column
+          align="center"
           label="实付金额"
           prop="qty"
           min-width="100"
@@ -968,6 +982,7 @@ export default {
         this.$set(this.mainForm, 'k3ServiceName', service.serviceName)
         this.$set(row, 'serviceId', service.serviceId)
         this.$set(row, 'serviceName', service.serviceName)
+        this.$set(row,'amount',service.amount || 0)
       } else {
         console.log(index)
         if (index === 0) {
@@ -976,7 +991,9 @@ export default {
         }
         this.$set(row, 'serviceId', '')
         this.$set(row, 'serviceName', '')
+        this.$set(row,'amount',0 )
       }
+
     },
     // 选择销售政策获取政策条件列表
     async handlePolicy(e) {
@@ -1282,6 +1299,7 @@ export default {
             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)
+            this.$set(this.multipleData[i],'amount', this.multipleData[i].wallets[0].amount)
           }
           arrData = [...arrData, ...this.multipleData[i]]
         }
@@ -1336,6 +1354,7 @@ export default {
               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)
               this.$set(this.multipleSelections[i][j], 'serviceId', this.multipleSelections[i][j].wallets[0].serviceId)
+              this.$set(this.multipleSelections[i][j],'amount',this.multipleSelections[i][j].wallets[0].amount)
             }
             arrData = [...arrData, this.multipleSelections[i][j]]
           }
@@ -1682,9 +1701,12 @@ export default {
           return e === k.customerWalletId
         })[0]
         this.$set(row, 'rebateRate', (obj.rebateRate || 0))
+
       } else {
         this.$set(row, 'rebateRate', 0)
+
       }
+
     },
     clearWallet(e) {
       console.log(e)

src/views/supply/policy/policy_list.vue

@@ -312,9 +312,10 @@
             >
               <template slot-scope="scope">
                 <div>{{ scope.row.rebateAmount | numToFixed }}</div>
-                <div>(实际：{{ scope.row.payRebateAmount | numToFixed }})</div>
+<!--                <div>(实际：{{ scope.row.payRebateAmount | numToFixed }})</div>-->
               </template>
             </el-table-column>
+       
             <el-table-column
               align="center"
               label="格力折扣"
@@ -641,7 +642,7 @@ export default {
       }
       getList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.sums1 = ['qty', 'directTransferQty', 'hasSendQty', 'refundableQty'];
+          item.sums1 = ['qty', 'directTransferQty', 'hasSendQty', 'refundableQty','payRebateAmount'];
           item.sums2 = ['price', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
         })
         this.dataList = res.data.records