From 24ea0f3e5440b6a551040162ebdc3639afd68783 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 4 Jun 2024 18:55:40 +0800
Subject: [PATCH] =?UTF-8?q?6/4=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=A1=AE=E8=AE=A4=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/supInoutSearchOrder.vue | 47 +++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 2c57ec53..2e7f23e9 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -169,7 +169,7 @@
             </el-form-item>
             <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery[item.columnName]"
+                v-model="map[item.columnName]"
                 :placeholder="item.columnDesc"
                 :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
@@ -198,6 +198,7 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
+
             <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
@@ -208,6 +209,18 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePickera' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="confirmDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
           </template>
         </el-row>
       </el-form>
@@ -443,7 +456,8 @@ export default {
         fromCorp: null,
         keyWords: null,
         inoutPrintStatus: null,
-
+        confirmStarTime:null,  //发票确认起始日期
+        confirmEndTime:null,
       },
 
       printMap: {
@@ -464,9 +478,13 @@ export default {
       orderSelection: [],
       showSup: false,
       customerId: this.$store.getters.customerId,
+      map:{
+        "actDateRange" : this.actDateRange,
+        "confirmDateRange" : this.confirmDateRange,
+      },
       actDateRange: [],
+      confirmDateRange:[],
       actionType: null,
-
       auditDateRange: [],
       pickerOptions: {
         shortcuts: [
@@ -535,6 +553,13 @@ export default {
         this.filterQuery.startAduditTime = null;
         this.filterQuery.endAduditTime = null;
       }
+      if (this.confirmDateRange!== null) {
+        this.filterQuery.confirmStarTime = this.confirmDateRange[0];
+        this.filterQuery.confirmEndTime = this.confirmDateRange[1];
+      } else {
+        this.filterQuery.confirmStarTime = null;
+        this.filterQuery.confirmEndTime = null;
+      }
       this.filterQuery.page = 1;
 
       this.getList();
@@ -626,6 +651,8 @@ export default {
               let printParams = {
                 startAduditTime :this.filterQuery.startAduditTime,
                 endAduditTime: this.filterQuery.endAduditTime,
+                confirmStarTime : this.filterQuery.confirmStarTime ,
+                confirmEndTime : this.filterQuery.confirmEndTime ,
                 employeeName: this.$store.getters.user.employeeName,
                 locInvName:this.$store.getters.locInvName,
                 templateId: res.data,
@@ -689,6 +716,13 @@ export default {
                 printParams.startAduditTime = null;
                 printParams.endAduditTime = null;
               }
+              if (this.confirmDateRange!== null) {
+                printParams.confirmStarTime = this.confirmDateRange[0];
+                printParams.confirmEndTime = this.confirmDateRange[1];
+              } else {
+                printParams.confirmStarTime = null;
+                printParams.confirmEndTime = null;
+              }
               printOrder(printParams).then((response) => {
                 //将pdf文件转换为url。
                 const binaryData = [];
@@ -777,6 +811,13 @@ export default {
             printParams.startAduditTime = null;
             printParams.endAduditTime = null;
           }
+          if (this.confirmDateRange!== null) {
+            printParams.confirmStarTime = this.confirmDateRange[0];
+            printParams.confirmEndTime = this.confirmDateRange[1];
+          } else {
+            printParams.confirmStarTime = null;
+            printParams.confirmEndTime = null;
+          }
           excelInoutImport(printParams).then((response) => {
             let blob = new Blob([response], {type: "application/vnd.ms-excel"});
             let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象