Merge tag 'Hotfix-mo-22' into develop

Finish Hotfix-mo-22

src/utils/common.js

@@ -1,7 +1,5 @@
 
 import { MessageBox, Message, Notification } from 'element-ui'
-import {useRouter, useRoute} from 'vue-router'
-import router from '@/router'
 
 export const successMsg = msg => {
 	Message({
@@ -60,28 +58,33 @@ export const getSummaries = (param) => {
       sums[index] = '合计';
       return;
     }
-    const values = data.map(item => Number(item[column.property]));
-    if (data[0] && data[0].sums1.includes(column.property)) {
-      sums[index] = values.reduce((prev, curr) => {
-        const value = Number(curr);
-        if (!isNaN(value)) {
-          return prev + curr;
-        } else {
-          return prev;
-        }
-      }, 0);
-      sums[index];
+    try {
+      const values = data.map(item => Number(item[column.property]));
+      if (data[0] && data[0].sums1.includes(column.property)) {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return prev + curr;
+          } else {
+            return prev;
+          }
+        }, 0);
+        sums[index];
+      }
+      if (data[0] && data[0].sums2.includes(column.property)) {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return prev + curr;
+          } else {
+            return prev;
+          }
+        }, 0).toFixed(2);
+        sums[index];
+      }
     }
-    if (data[0] && data[0].sums2.includes(column.property)) {
-      sums[index] = values.reduce((prev, curr) => {
-        const value = Number(curr);
-        if (!isNaN(value)) {
-          return prev + curr;
-        } else {
-          return prev;
-        }
-      }, 0).toFixed(2);
-      sums[index];
+    catch {
+      console.log('error');
     }
   });
   return sums;

src/views/supply/adjust/adjust_list.vue

@@ -59,7 +59,16 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="发货单号" prop="deliverNo" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="发货日期" prop="deliverDate" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="120" show-overflow-tooltip></el-table-column>
@@ -205,6 +214,10 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
       };
       getList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['qty'];
+          item.sums2 = ['mustTotalAmount', 'afterTaxPrice', 'noTaxTotalAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/deliver/commerce_list.vue

@@ -95,7 +95,16 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="发货单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -109,11 +118,7 @@
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="未出库数量" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.salesStatus ? 0 : scope.row.refundableQty}}
-              </template>
-            </el-table-column>
+            <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
@@ -294,6 +299,11 @@ export default {
         orderType: 3, // 2家用工程 3商用工程
       };
       getEnginList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
+          item.sums1 = ['refundableQty', 'notOutNumber'];
+          item.sums2 = [];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/deliver/deliver_list.vue

@@ -73,7 +73,16 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="发货单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -97,11 +106,7 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="未出库数量" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.salesStatus ? 0 : scope.row.refundableQty}}
-              </template>
-            </el-table-column>
+            <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
@@ -267,6 +272,11 @@ export default {
         categoryName: this.screenForm.type,
       };
       getDeliverList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
+          item.sums1 = ['refundableQty', 'notOutNumber'];
+          item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/deliver/home_list.vue

@@ -90,7 +90,16 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="发货单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -116,11 +125,7 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="未出库数量" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.salesStatus ? 0 : scope.row.refundableQty}}
-              </template>
-            </el-table-column>
+            <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
@@ -296,6 +301,11 @@ export default {
         orderType: 2, // 2家用工程 3商用工程
       };
       getEnginList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
+          item.sums1 = ['refundableQty', 'notOutNumber'];
+          item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/reserve/reserve_list.vue

@@ -86,7 +86,9 @@
             border 
             fit 
             highlight-current-row 
-            stripe>
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="状态" prop="status" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.status | statusFilter}}
@@ -106,10 +108,10 @@
             <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="开单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="开单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="经销商编码" prop="customerId" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/return/components/return_detail.vue

@@ -100,7 +100,7 @@
     </div>
     
     <div class="page-footer">
-      <div class="footer" :class="classObj">
+      <div class="footer">
         <!-- <el-button  type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button> -->
         <el-button @click="goBack">关 闭</el-button>
       </div>
@@ -129,18 +129,6 @@ export default {
     }
   },
 
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
-  },
-
   created() {
     this.getDetail();
   },

src/views/supply/return/return_list.vue

@@ -64,7 +64,16 @@
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table 
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
             <el-table-column align="center" label="退换单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="退货日期" prop="retreatTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -194,6 +203,10 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
       };
       getList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['num'];
+          item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount'];
+        })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;