修复押金字段显示

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

@@ -244,7 +244,7 @@
             <el-table-column
               align="right"
               label="发货数量"
-              prop="hasSendQty"
+              prop="orderHasSendQty"
               min-width="160"
               show-overflow-tooltip
             />
@@ -905,7 +905,7 @@ export default {
           }
           res.data.items.forEach((item) => {
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['hasSendQty', 'dataQty', 'qty']
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
             item.sums2 = ['totalAmount', 'diffAmount', 'price']
           })
         })

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -305,7 +305,7 @@
             <el-table-column
               align="right"
               label="发货数量"
-              prop="hasSendQty"
+              prop="orderHasSendQty"
               min-width="160"
               show-overflow-tooltip
             />
@@ -732,7 +732,7 @@ export default {
       }
       res.data.items.forEach((item) => {
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["hasSendQty", "dataQty", "qty"];
+        item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
         item.sums2 = ["totalAmount", "diffAmount", "price"];
       });
       this.detailList = res.data;

src/views/deposit_commerce/deposit_list.vue

@@ -461,13 +461,13 @@
               show-overflow-tooltip
             />
 
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="itemDataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+<!--            <el-table-column-->
+<!--              align="right"-->
+<!--              label="上交资料"-->
+<!--              prop="itemDataQty"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            />-->
             <el-table-column
               align="center"
               label="操作"

src/views/deposit_commerce/refund_list.vue

@@ -341,7 +341,7 @@
                 {{ scope.row.depositAmount | numToFixed}}
               </template>
             </el-table-column> -->
-            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
+<!--            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />-->
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="

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

@@ -187,25 +187,32 @@
           />
           <el-table-column
             align="center"
-            label="发货数量"
+            label="押金数量"
             prop="hasSendQty"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
-            label="押金金额"
-            prop="depositAmount"
+            label="发货数量"
+            prop="orderHasSendQty"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
-            label="上交资料"
-            prop="dataQty"
+            label="押金金额"
+            prop="depositAmount"
             min-width="160"
             show-overflow-tooltip
           />
+<!--          <el-table-column-->
+<!--            align="center"-->
+<!--            label="上交资料"-->
+<!--            prop="dataQty"-->
+<!--            min-width="160"-->
+<!--            show-overflow-tooltip-->
+<!--          />-->
           <el-table-column
             align="center"
             label="收差全额"
@@ -445,7 +452,7 @@ export default {
       this.details = res.data
       res.data.items.forEach((item) => {
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['hasSendQty', 'dataQty', 'qty']
+        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
         item.sums2 = ['totalAmount', 'diffAmount', 'price']
       })
     })

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

@@ -251,9 +251,16 @@
               </template>
             </el-table-column>
             <el-table-column
+              align="center"
+              label="押金数量"
+              prop="hasSendQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
               align="right"
               label="发货数量"
-              prop="hasSendQty"
+              prop="orderHasSendQty"
               min-width="160"
               show-overflow-tooltip
             />
@@ -268,13 +275,13 @@
                 {{ scope.row.depositAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="dataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+<!--            <el-table-column-->
+<!--              align="right"-->
+<!--              label="上交资料"-->
+<!--              prop="dataQty"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            />-->
             <el-table-column
               align="right"
               label="收差全额"
@@ -915,7 +922,7 @@ export default {
           }
           res.data.items.forEach((item) => {
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['hasSendQty', 'dataQty', 'qty']
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
             item.sums2 = ['totalAmount', 'diffAmount', 'price']
           })
         })

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

@@ -304,9 +304,16 @@
             </template>
             </el-table-column>
             <el-table-column
+              align="center"
+              label="押金数量"
+              prop="hasSendQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
               align="right"
               label="发货数量"
-              prop="hasSendQty"
+              prop="orderHasSendQty"
               min-width="160"
               show-overflow-tooltip
             />
@@ -321,13 +328,13 @@
                 {{ scope.row.depositAmount | numToFixed}}
             </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="dataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+<!--            <el-table-column-->
+<!--              align="right"-->
+<!--              label="上交资料"-->
+<!--              prop="dataQty"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            />-->
             <el-table-column
               align="right"
               label="收差全额"
@@ -734,7 +741,7 @@ export default {
       }
       res.data.items.forEach((item) => {
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["hasSendQty", "dataQty", "qty"];
+        item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
         item.sums2 = ["totalAmount", "diffAmount", "price"];
       });
       this.detailList = res.data;

src/views/deposit_home/deposit_list.vue

@@ -484,18 +484,18 @@
             <el-table-column
               align="right"
               label="发货数量"
-              prop="hasSendQty"
+              prop="orderHasSendQty"
               min-width="160"
               show-overflow-tooltip
             />
 
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="itemDataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+<!--            <el-table-column-->
+<!--              align="right"-->
+<!--              label="上交资料"-->
+<!--              prop="itemDataQty"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            />-->
             <el-table-column
               align="center"
               label="操作"
@@ -682,7 +682,7 @@ export default {
           item.totalPrice = item.itemPrice * item.itemQty
 
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-          item.sums1 = ['qty','hasSendQty','itemDataQty']
+          item.sums1 = ['qty','orderHasSendQty','itemDataQty']
           item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice']
         })
         this.listLoading = false

src/views/deposit_home/refund_list.vue

@@ -332,13 +332,13 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="发货数量" prop="orderHasSendQty" 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="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
+<!--            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />-->
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="
@@ -650,7 +650,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.totalPrice = item.itemPrice * item.itemQty;
-        item.sums1 = ["hasSendQty", "itemDataQty", "itemQty"];
+        item.sums1 = ["orderHasSendQty", "itemDataQty", "itemQty"];
         item.sums2 = [
           "itemDepositAmount",
           "diffAmount",