Forráskód Böngészése

押金增加合计

howie 3 éve
szülő
commit
ee3a5cc12c

+ 1 - 1
src/components/Common/image-upload.vue

@@ -206,7 +206,7 @@ export default {
       // 押金申请上传限制
       if (this.startRestricting) {
         console.log(this.restrictFilename.join(''))
-        if (fileName.includes(this.restrictFilename.join('')) === -1 || !suffix.includes('zip', 'rar', 'gz', 'apk')) {
+        if (fileName.includes(this.restrictFilename.join('')) === -1 || suffix.includes('zip', 'rar', 'gz', 'apk')) {
           this.fileName = `其他文件${suffix}`
           console.log(this.fileName, '4454')
         }

+ 7 - 0
src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -123,6 +123,8 @@
           show-summary
           highlight-current-row
           stripe
+          show-summary
+          :summary-method="$getSummaries"
         >
           <el-table-column
             align="center"
@@ -294,6 +296,11 @@ export default {
   created() {
     geDetail({ id: this.$parent.depositManageId }).then((res) => {
       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.sums2 = ["totalAmount", "diffAmount", "price"];
+      });
     });
   },
   methods: {

+ 8 - 1
src/views/engin_deposit/components/deposit_list-detail.vue

@@ -126,6 +126,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="$getSummaries"
           >
             <el-table-column
               align="center"
@@ -211,7 +213,7 @@
         <el-row :gutter="0">
           <el-col :xs="12" :sm="12" :lg="12" class="item">
             <div class="label">申请人</div>
-            <div class="value">{{ details.submitBy }}</div>
+            <div class="value">{{ details.submitName }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
             <div class="label">申请日期</div>
@@ -539,6 +541,11 @@ export default {
       if (this.engineering == "工程押金信息") {
         geDetail({ id: this.$parent.depositManageId }).then((res) => {
           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.sums2 = ["totalAmount", "diffAmount", "price"];
+          });
         });
       } else if (this.engineering == "工程订单信息") {
         geOrderInfo({