Finish Hotfix-zh-207

src/views/supply/deliver/sum_list.vue

@@ -90,13 +90,13 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="审核时间" prop="approvaTime">
-              <el-date-picker v-model="screenForm.approvaTime" type="datetimerange" range-separator="至"
+                <el-date-picker v-model="screenForm.approvaTime" type="datetimerange" range-separator="至"
                   style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
                   end-placeholder="结束日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-           <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -112,7 +112,7 @@
             <el-button type="primary" size="mini" @click="toPrint" :disabled="tableSelection.length < 1">打印发货单
             </el-button>
             <div class="num" v-if="totalNum">
-              当前列表总发货数量：{{totalNum}}
+              当前列表总发货数量：{{ totalNum }}
             </div>
           </div>
           <!--  -->
@@ -330,7 +330,7 @@
 
 <script>
 import { getSumList } from '@/api/supply/deliver'
-import { checkPassword ,getListInvoiceNumber} from "@/api/supply/pickup";
+import { checkPassword, getListInvoiceNumber } from "@/api/supply/pickup";
 import { getCategoryList, getSalesmanList } from '@/api/common'
 import SumPrint from '@/views/supply/deliver/components/sum_print'
 
@@ -389,7 +389,7 @@ export default {
         mainOrderId: '',
         approvalEndTime: '',
         approvalStartTime: '',
-        approvaTime:''
+        approvaTime: ''
       },
       categoryList: [],
       salesmanList: [],
@@ -397,7 +397,7 @@ export default {
       tableSelection: [],
       queryItem: {},
       isShowPrint: false,
-      totalNum:0,
+      totalNum: 0,
       curPaper: {
         type: 'A5',
         width: 500,
@@ -565,7 +565,7 @@ export default {
 
     // 查询列表
     getList() {
-     
+
       this.listLoading = true;
       let params = {
         pageNum: this.currentPage,
@@ -588,6 +588,8 @@ export default {
         approvalEndTime: this.screenForm.approvaTime[0],
         approvalStartTime: this.screenForm.approvaTime[1]
       };
+
+
       getSumList(params).then((res) => {
         res.data.records.forEach(item => {
           item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
@@ -598,13 +600,35 @@ export default {
         this.listTotal = res.data.total;
         this.listLoading = false;
       })
-      getListInvoiceNumber(params).then(res=>{
+      this.getListInvoiceNumber()
+    },
+
+    getListInvoiceNumber() {
+      let params = {
+        materialName: this.screenForm.goodsName,
+        materialNumber: this.screenForm.goodsCode,
+        materialOldNumber: this.screenForm.goodsOldCode,
+        specification: this.screenForm.model,
+        createStartTime: this.screenForm.createDate ? this.screenForm.createDate[0] : '',
+        createEndTime: this.screenForm.createDate ? this.screenForm.createDate[1] : '',
+        startTime: this.screenForm.deliverDate ? this.screenForm.deliverDate[0] : '',
+        endTime: this.screenForm.deliverDate ? this.screenForm.deliverDate[1] : '',
+        customerNumber: this.screenForm.jxsNum,
+        customerName: this.screenForm.jxsName,
+        id: this.screenForm.orderNum,
+        categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
+        k3ServiceId: this.screenForm.k3ServiceId,
+        mainOrderId: this.screenForm.mainOrderId,
+        approvalEndTime: this.screenForm.approvaTime[0],
+        approvalStartTime: this.screenForm.approvaTime[1]
+      };
+      getListInvoiceNumber(params).then(res => {
         // console.log(res,'ii');
         this.totalNum = res.data
       })
-
-    },
-
+    }
+    ,
     // 提交筛选表单
     submitScreenForm() {
       this.currentPage = 1;
@@ -744,12 +768,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .num{
-    display: inline-block;
-    font-size: 16px;
-    margin-left: 20px;
-    color: #909399;
-    vertical-align: middle;
+.num {
+  display: inline-block;
+  font-size: 16px;
+  margin-left: 20px;
+  color: #909399;
+  vertical-align: middle;
 }
-  
 </style>