fix: 其他零售单，政策单，家用工程，商用工程 显示返利比例

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

@@ -230,6 +230,8 @@
                 {{ scope.row.payRebateAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
             <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.discAmount | numToFixed }}

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

@@ -200,6 +200,8 @@
             {{ scope.row.payRebateAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.discAmount | numToFixed }}
@@ -361,7 +363,7 @@ export default {
           examineCom(params).then(res => {
             this.$successMsg()
             this.goBack()
-            
+
           })
         })
         .catch(() => {})

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

@@ -318,6 +318,8 @@
             {{ (scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100 }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="center" label="格力折扣" prop="zk" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.qty * scope.row.discAmount }}
@@ -1105,7 +1107,7 @@ export default {
               editCom(params).then(res => {
                 this.$successMsg('编辑成功')
                 this.goBack()
-                
+
               })
             } else {
               params.customerNumber = this.mainForm.jxsNum
@@ -1114,7 +1116,7 @@ export default {
               addCom(params).then(res => {
                 this.$successMsg('新增成功')
                 this.goBack()
-                
+
               })
             }
           } else if (type === 2) {
@@ -1124,7 +1126,7 @@ export default {
             submitCom(params).then(res => {
               this.$successMsg('提交审核成功')
               this.goBack()
-              
+
             })
           }
         }

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

@@ -182,6 +182,8 @@
             {{ scope.row.payRebateAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.discAmount | numToFixed }}
@@ -353,7 +355,7 @@ export default {
           returnCom(params).then(res => {
             this.$successMsg()
             this.goBack()
-           
+
           })
         })
         .catch(() => {})

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

@@ -289,6 +289,8 @@
                 {{ scope.row.payRebateAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
             <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.discAmount | numToFixed }}

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

@@ -354,6 +354,8 @@
             {{ ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.discAmount | numToFixed }}

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

@@ -384,6 +384,8 @@
             {{ (scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100 }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="center" label="格力折扣" prop="ko" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.qty * scope.row.discAmount }}

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

@@ -271,6 +271,8 @@
             {{ scope.row.rebateAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.discAmount | numToFixed }}

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

@@ -160,6 +160,8 @@
               {{ scope.row.payRebateAmount | numToFixed }}
             </template>
           </el-table-column>
+          <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
           <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.totalDiscAmount | numToFixed }}

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

@@ -174,6 +174,8 @@
             {{ scope.row.payRebateAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column
           align="center"
           label="格力折扣"
@@ -379,7 +381,7 @@ export default {
         .then(res => {
           this.$successMsg('审批成功')
           this.goBack()
-         
+
         })
         .finally(res => {
           this.formLoading = false

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

@@ -177,6 +177,8 @@
             {{ ((scope.row.price - scope.row.discAmount) * scope.row.qty * ((scope.row.rebateRate || 0) * 100)) / 100 }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" min-width="100" prop="compute_zkAmount" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ (scope.row.qty * scope.row.discAmount) | numToFixed }}

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

@@ -176,6 +176,8 @@
               {{ scope.row.payRebateAmount | numToFixed }}
             </template>
           </el-table-column>
+          <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
           <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.totalDiscAmount | numToFixed }}

src/views/supply/retail/components/retail_examine.vue

@@ -146,6 +146,8 @@
             {{ scope.row.payRebateAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.totalDiscAmount | numToFixed }}

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

@@ -245,6 +245,8 @@
             }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column align="right" label="格力折扣" prop="compute_zkAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ (scope.row.qty * scope.row.discAmount) | numToFixed }}

src/views/supply/retail/components/retail_return.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="退订"></el-page-header>
+    <el-page-header content="退订" @back="goBack" />
 
     <div class="main-title">
       <div class="title">
@@ -69,62 +69,62 @@
         show-summary
         :summary-method="$getSummaries"
       >
-        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+        <el-table-column align="center" label="序号" type="index" width="50" />
         <el-table-column
           align="center"
           label="销售类型"
           prop="saleTypeName"
           min-width="100"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column
           align="center"
           label="物料编码"
           prop="materialCode"
           min-width="120"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column
           align="center"
           label="产品编码"
           prop="materialOldNumber"
           min-width="120"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column
           align="center"
           label="产品名称"
           prop="materialName"
           min-width="160"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column
           align="center"
           label="规格型号"
           prop="specification"
           min-width="160"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column
           align="center"
           label="单位"
           prop="unit"
           min-width="100"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip />
         <el-table-column
           align="center"
           label="已退订数量"
           prop="retiredQty"
           min-width="100"
           show-overflow-tooltip
-        ></el-table-column>
+        />
 
         <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -137,7 +137,7 @@
           prop="customerWalletName2"
           min-width="140"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column align="right" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.rebateAmount | numToFixed }}
@@ -148,13 +148,15 @@
             {{ scope.row.totalDiscAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="返利比例" min-width="100" prop="rebateRate" show-overflow-tooltip />
+
         <el-table-column
           align="center"
           label="现金钱包"
           prop="customerWalletName"
           min-width="140"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.payAmount | numToFixed }}
@@ -171,17 +173,17 @@
           prop="directTransferQty"
           min-width="100"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column
           align="right"
           label="可退数量"
           prop="refundableQty"
           min-width="100"
           show-overflow-tooltip
-        ></el-table-column>
+        />
         <el-table-column align="right" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="small" type="number" @mousewheel.native.prevent></el-input>
+            <el-input v-model="scope.row.tdQty" size="small" type="number" @mousewheel.native.prevent />
           </template>
         </el-table-column>
         <el-table-column
@@ -190,8 +192,8 @@
           prop="remark"
           min-width="160"
           show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+        />
+        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip />
       </el-table>
     </div>
 
@@ -217,7 +219,7 @@
 
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{
+        <el-button type="primary" :loading="formLoading" @click="clickSubmitForm">{{
           formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
         <el-button @click="goBack">返回列表</el-button>
@@ -232,7 +234,6 @@ import { getDetail, returnData } from '@/api/supply/retail'
 export default {
   name: 'RetailReturn',
   componentName: 'RetailReturn',
-  props: ['listItem'],
   filters: {
     statusFilter(val) {
       const statusList = [
@@ -241,10 +242,11 @@ export default {
         { label: '审核通过', value: 'OK' }
         // { label: '审核驳回', value: 'FAIL' },,
       ]
-      let obj = statusList.find(o => o.value == val)
+      const obj = statusList.find(o => o.value == val)
       return obj ? obj.label : ''
     }
   },
+  props: ['listItem'],
   data() {
     return {
       detailData: {},