Finish Hotfix-zh-280

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

@@ -434,12 +434,18 @@ export default {
   created() {
     this.imageURL = this.$imageUrl
     geDetail({ id: this.$parent.depositManageId }).then((res) => {
-      this.details = res.data
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ['hasSendQty', 'dataQty', 'qty']
         item.sums2 = ['totalAmount', 'diffAmount', 'price']
       })
+      res.data.items = arr
+      this.details = res.data
+
     })
   },
   methods: {

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

@@ -897,17 +897,23 @@ export default {
 
       if (this.engineering == '工程押金信息') {
         geDetail({ id: this.$parent.depositManageId }).then((res) => {
-          this.details = res.data
           if (res.data.dataList.length == 0) {
             this.isDis = true
           } else {
             this.isDis = false
           }
+          let arr = []
           res.data.items.forEach((item) => {
+            if (Number(item.qty)>0) {
+              arr.push(item)
+            }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
             item.sums1 = ['hasSendQty', 'dataQty', 'qty']
             item.sums2 = ['totalAmount', 'diffAmount', 'price']
           })
+          res.data.items = arr
+          this.details = res.data
+
         })
       } else if (this.engineering == '工程订单信息') {
         geOrderInfo({

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

@@ -730,11 +730,16 @@ export default {
       } else {
         this.isDis = false;
       }
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["hasSendQty", "dataQty", "qty"];
         item.sums2 = ["totalAmount", "diffAmount", "price"];
       });
+      res.data.items = arr
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||

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

@@ -442,12 +442,18 @@ export default {
   created() {
     this.imageURL = this.$imageUrl
     geDetail({ id: this.$parent.depositManageId }).then((res) => {
-      this.details = res.data
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ['hasSendQty', 'dataQty', 'qty']
         item.sums2 = ['totalAmount', 'diffAmount', 'price']
       })
+      res.data.items = arr
+      this.details = res.data
+
     })
   },
   methods: {

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

@@ -907,17 +907,23 @@ export default {
 
       if (this.engineering == '工程押金信息') {
         geDetail({id: this.$parent.depositManageId}).then((res) => {
-          this.details = res.data
+
           if (res.data.dataList.length == 0) {
             this.isDis = true
           } else {
             this.isDis = false
           }
+          let arr = []
           res.data.items.forEach((item) => {
+            if (Number(item.qty)>0) {
+              arr.push(item)
+            }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
             item.sums1 = ['hasSendQty', 'dataQty', 'qty']
             item.sums2 = ['totalAmount', 'diffAmount', 'price']
           })
+          res.data.items = arr
+          this.details = res.data
         })
       } else if (this.engineering == '工程订单信息') {
         geOrderInfo({

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

@@ -732,11 +732,16 @@ export default {
       } else {
         this.isDis = false;
       }
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["hasSendQty", "dataQty", "qty"];
         item.sums2 = ["totalAmount", "diffAmount", "price"];
       });
+      res.data.items = arr
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||

src/views/supply/pickup/components/pickup_form.vue

@@ -2,7 +2,7 @@
   <div class="detail-container">
     <el-page-header
       @back="goBack"
-      :content="listItem ? '编辑' : '新增'"
+      :content="listItem ? flag?'详情': '编辑' : '新增'"
     ></el-page-header>
     <el-divider></el-divider>
 
@@ -22,7 +22,7 @@
                 v-model="mainForm.warehouse"
                 placeholder="请选择仓库"
                 style="width: 100%"
-                :disabled="listItem.flag"
+                :disabled="flag"
               >
                 <el-option
                   :label="item.name"
@@ -34,7 +34,7 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-button size="small" type="primary"  v-if="!listItem.flag" @click="getDeliverList"
+            <el-button size="small" type="primary"  v-if="!flag" @click="getDeliverList"
               >确定</el-button
             >
           </el-col>
@@ -43,7 +43,7 @@
           <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
             <el-form-item label="预约日期" prop="date">
               <el-date-picker
-              :disabled="listItem.flag"
+              :disabled="flag"
                 v-model="mainForm.date"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -55,7 +55,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
             <el-form-item label="预约时段" prop="timeSlot">
-              <el-radio-group v-model="mainForm.timeSlot" :disabled="listItem.flag">
+              <el-radio-group v-model="mainForm.timeSlot" :disabled="flag">
                 <el-radio :label="1">上午</el-radio>
                 <el-radio :label="2">下午</el-radio>
               </el-radio-group>
@@ -65,7 +65,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="提货方式" prop="pickupWay">
-              <el-radio-group v-model="mainForm.pickupWay" :disabled="listItem.flag">
+              <el-radio-group v-model="mainForm.pickupWay" :disabled="flag">
                 <el-radio
                   :label="item.dictCode"
                   v-for="(item, index) in pickupWayList"
@@ -80,7 +80,7 @@
               <el-select
                 v-model="mainForm.pickupMan"
                 placeholder="全部"
-                :disabled="listItem.flag"
+                :disabled="flag"
                 style="width: 100%"
               >
                 <el-option
@@ -98,7 +98,7 @@
                 v-model="mainForm.pickupCar"
                 placeholder="全部"
                 style="width: 100%"
-                :disabled="listItem.flag"
+                :disabled="flag"
               >
                 <el-option
                   :label="item.carBrand"
@@ -115,7 +115,7 @@
                 v-model="mainForm.company"
                 placeholder="全部"
                 style="width: 100%"
-                :disabled="listItem.flag"
+                :disabled="flag"
               >
                 <el-option
                   :label="item.logisticsCompany"
@@ -132,7 +132,7 @@
             <el-form-item label="备注内容" prop="remark">
               <el-input
                 v-model="mainForm.remark"
-                :disabled="listItem.flag"
+                :disabled="flag"
                 placeholder="请输入备注内容"
               ></el-input>
             </el-form-item>
@@ -252,7 +252,7 @@
         <el-button
           type="primary"
           @click="clickSubmitForm"
-          v-if="!listItem.flag"
+          v-if="!flag"
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >
@@ -286,7 +286,7 @@ import { getDictList } from "@/api/common";
 export default {
   name: "PickupForm",
   componentName: "PickupForm",
-  props: ["listItem"],
+  props: ["listItem","flag"],
   data() {
     return {
       deliverList: null, // 列表数据

src/views/supply/pickup/pickup_list.vue

@@ -344,6 +344,7 @@
 
     <PickupForm
       :listItem="queryItem"
+      :flag="flag"
       v-if="isShowForm"
       @backListFormDetail="backList"
     />
@@ -372,7 +373,7 @@ export default {
         warehouse: "",
         date: "",
       },
-
+      flag:false,
       queryItem: {},
       isShowForm: false,
     };
@@ -454,8 +455,8 @@ export default {
     },
 
     // 进入表单
-    toForm(item,flag) {
-      item.flag = flag // 详情 flag 为 details
+    toForm(item,flag =false) {
+      this.flag = flag  // 详情 flag 为 details
       this.queryItem = item;
       this.isShowForm = true;
     },

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

@@ -86,6 +86,8 @@
         highlight-current-row
         stripe
         max-height="400"
+        show-summary
+        :summary-method="$getSummaries"
       >
         <el-table-column
           align="center"
@@ -374,6 +376,10 @@ export default {
     // 获取详情
     getDetail() {
       getDetail({ id: this.listItem.id }).then((res) => {
+        res.data.retailOrderItemList.forEach(item => {
+            item.sums1 = ['directTransferQty', 'qty', 'refundableQty', 'oldQty', 'tdQty'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'totalDiscAmount', 'rebateAmount'];
+          })
         this.detailData = res.data;
       });
       getUserList({

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

@@ -56,6 +56,8 @@
         highlight-current-row
         stripe
         max-height="400"
+        show-summary
+        :summary-method="$getSummaries"
       >
         <el-table-column
           align="center"
@@ -342,6 +344,10 @@ export default {
     // 获取详情
     getDetail() {
       getDetail({ id: this.listItem.id }).then((res) => {
+        res.data.retailOrderItemList.forEach(item => {
+            item.sums1 = ['directTransferQty', 'qty', 'refundableQty', 'oldQty', 'tdQty'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'totalDiscAmount', 'rebateAmount'];
+          })
         this.detailData = res.data;
       });
     },

src/views/supply/sales/sales_list.vue

@@ -222,6 +222,7 @@
               prop="examineStatus"
               min-width="100"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 {{ scope.row.examineStatus | statusFilter }}
@@ -233,6 +234,7 @@
               prop="printTime"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="left"
@@ -240,6 +242,7 @@
               prop="orderType"
               min-width="100"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 {{ scope.row.orderType | orderTypeFilter }}
@@ -251,6 +254,7 @@
               prop="billReceipt"
               min-width="250"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 {{ scope.row.billReceipt }}
@@ -260,8 +264,9 @@
               align="left"
               label="销售出库单号"
               prop="id"
-              min-width="110"
+              min-width="140"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
@@ -274,6 +279,7 @@
               prop="orderNo"
               min-width="130"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.orderNo" />
@@ -286,6 +292,7 @@
               prop="orderNo"
               min-width="140"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText='scope.row.orderType === "TRADE" ||
@@ -307,13 +314,15 @@
               prop="correspondName"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="left"
               label="经销商编码"
               prop="customerNumber"
-              min-width="100"
+              min-width="120"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -326,6 +335,7 @@
               prop="customerName"
               min-width="250"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
@@ -338,6 +348,7 @@
               prop="materialCode"
               min-width="120"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
@@ -350,6 +361,7 @@
               prop="materialOldNumber"
               min-width="140"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
@@ -362,6 +374,7 @@
               prop="materialName"
               min-width="160"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
@@ -374,6 +387,7 @@
               prop="specification"
               min-width="350"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
@@ -386,6 +400,7 @@
               prop="unit"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="left"
@@ -393,6 +408,7 @@
               prop="createBy"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="right"
@@ -400,23 +416,31 @@
               prop="refundableQty"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
 
-            <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+            <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip
+              sortable>
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column> -->
-            <!-- <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+            <!-- <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip
+              sortable>
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column> -->
-            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column> -->
+            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip
+              sortable></el-table-column> -->
 
             <el-table-column
               align="center"