Merge tag 'Hotfix-zh-267' into develop

Finish Hotfix-zh-267

src/views/deposit_commerce/deposit_list.vue

@@ -445,12 +445,12 @@
             <el-table-column
               align="right"
               label="金额"
-              prop="totalAmount"
+              prop="totalPrice"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
+                {{ scope.row.totalPrice | numToFixed}}
             </template>
             </el-table-column>
             <el-table-column
@@ -460,17 +460,7 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <el-table-column
-              align="right"
-              label="押金金额"
-              prop="depositAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-             <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed}}
-            </template>
-            </el-table-column>
+
             <el-table-column
               align="right"
               label="上交资料"
@@ -659,9 +649,10 @@ export default {
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {
+          item.totalPrice = item.itemPrice * item.itemQty
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
           item.sums1 = ['qty','hasSendQty','itemDataQty']
-          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount']
+          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice']
         })
         this.listLoading = false
         this.listTotal = res.data.total

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

@@ -477,6 +477,7 @@
       </div>
       <div style="margin: 20px 0">
         <el-button
+        v-if=" details.examineStatus != 'OK' || (!isCustomer && details.examineStatus == 'OK')"
           type="primary"
           size="small"
           @click="handleSvse"

src/views/deposit_home/deposit_list.vue

@@ -472,12 +472,12 @@
             <el-table-column
               align="right"
               label="金额"
-              prop="totalAmount"
+              prop="totalPrice"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
+                {{ scope.row.totalPrice | numToFixed}}
             </template>
             </el-table-column>
             <el-table-column
@@ -487,17 +487,7 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <el-table-column
-              align="right"
-              label="押金金额"
-              prop="depositAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-             <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed}}
-            </template>
-            </el-table-column>
+
             <el-table-column
               align="right"
               label="上交资料"
@@ -688,9 +678,11 @@ export default {
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {
+          item.totalPrice = item.itemPrice * item.itemQty
+
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
           item.sums1 = ['qty','hasSendQty','itemDataQty']
-          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount']
+          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice']
         })
         this.listLoading = false
         this.listTotal = res.data.total

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

@@ -752,7 +752,7 @@ export default {
       }
     }
   },
-    component:{
+  computed:{
     isCustomer(){
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }

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

@@ -629,7 +629,7 @@
           <el-table-column
             align="left"
             label="表体备注"
-            prop="itemRemark"
+            prop="remark"
             min-width="160"
             show-overflow-tooltip
           />