Finish Hotfix-zh-44

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')
         }

src/views/basic_data/material/components/modify_list-apply.vue

@@ -119,7 +119,7 @@
                 <el-button
                   type="text"
                   class="textColor"
-                  @click="hanleDeleInd(scope.$index, scope.row.cid)"
+                  @click="hanleDeleInd(scope.$index, scope.row.cid,scope.row.materialId)"
                 >删除</el-button>
               </template>
             </el-table-column>
@@ -1079,16 +1079,17 @@ export default {
     indexMethod(index) {
       console.log(index)
     },
-    hanleDeleInd(index, id) {
-      if (id) {
+    hanleDeleInd(index, id,materialId) {
+
+      if (id || materialId) {
         const dataArr = JSON.parse(JSON.stringify(this.dataList))
         for (let j = 0; j < dataArr.length; j++) {
-          if (id == dataArr[j].id) {
-            dataArr[j].disabled = false
+          if ((id || materialId) === dataArr[j].id) {
+            // dataArr[j].disabled = false
+            console.log(747)
             this.$set(dataArr[j], 'disabled', false)
           }
         }
-
         this.dataList = dataArr
       }
 
@@ -1428,6 +1429,7 @@ export default {
           const rebateList = []
           const walletIds = []
           const walletRebateIds = []
+          result.data[i].id = result.data[i].materialId
           result.data[i].isPublishArr = [
             {
               value: '是',
@@ -1514,10 +1516,21 @@ export default {
             }
           }
         }
-        function resArrs(arr1, arr2) {
-          return arr1.filter((v) => arr2.every((val) => val.materialId != v.id))
+
+
+        this.items = [...this.items,...result.data]
+        let newArr = [];
+        let obj = {};
+        for (var i = 0; i < this.items.length; i++) {
+          if (!obj[this.items[i].key]) {
+            newArr.push(this.items[i])
+            obj[this.items[i].key] = true
+          }
         }
-        this.items = [...this.items,...resArrs(result.data,this.dataList)]
+        console.log(newArr,454)
+        this.items = newArr
+        // console.log(resArrs(result.data,this.dataList),'55555')
+
       } else {
         this.$alert(result.message, '导入失败', {
           confirmButtonText: '确定'

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: {

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({