Merge tag 'Hotfix-zh-46' into develop

Finish Hotfix-zh-46

src/views/engin_deposit/deposit_list.vue

@@ -113,6 +113,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="$getSummaries"
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionAllChange"
           >
@@ -181,7 +183,12 @@
               prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+
             <el-table-column
               align="center"
               label="状态"
@@ -343,11 +350,17 @@ export default {
       const params = {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        isRefundDeposit: this.deduction ==='已退押'?true:null,
+        isRefundDeposit: this.deduction === '已退押' ? true : null,
         ...this.screenForm
       }
+      
       getList(params).then((res) => {
         this.dataList = res.data.records
+        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']
+        })
         this.listLoading = false
         this.listTotal = res.data.total
       })

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

@@ -109,7 +109,7 @@
         <el-divider direction="vertical" />
       </div>
     </div>
-    <div class="table" style="margin-top: 20px">
+    <div class="table" >
       <el-table
         :data="goodsList"
         element-loading-text="Loading"
@@ -385,8 +385,8 @@
         </el-table-column>
       </el-table>
     </div>
-
-    <div class="page-footer" style="position: fixed; bottom: 0; z-index: 99">
+    
+    <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
         <el-popconfirm
@@ -398,7 +398,6 @@
         </el-popconfirm>
       </div>
     </div>
-
     <el-dialog
       :visible.sync="isShowDialog"
       width="80%"
@@ -1781,11 +1780,13 @@ export default {
 .detail-container {
   width: 100%;
   height: 100%;
+  margin-bottom:80px;
   ::v-deep .el-table__append-wrapper{
     overflow: initial;
   }
 }
 .table{
+  margin-top: 20px 0 0 0;
   background-color: rgb(237 237 237);
 }
 .page-footer .footer.hideSidebar{
@@ -1841,7 +1842,5 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.app-container{
-  margin-bottom: 80px;
-}
+
 </style>