From 04b69d06d729e7d7a537053d93ef7ca3cc133c1c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 19 Nov 2024 14:30:01 +0800
Subject: [PATCH] =?UTF-8?q?11/19=20=E5=99=A8=E6=A2=B0:=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=82=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purOrder/purOrder.vue              |  3 ++-
 src/views/purchase/purOrder/purOrderAudit.vue         |  3 ++-
 src/views/purchase/purOrder/purOrderSearch.vue        |  3 ++-
 src/views/purchase/purOrder/purOrderSearchDetails.vue |  3 ++-
 src/views/purchase/purPlan/purPlan.vue                | 11 +++++++----
 src/views/purchase/purPlan/purPlanAudit.vue           | 11 +++++++----
 src/views/purchase/purPlan/purPlanSearch.vue          | 11 +++++++----
 src/views/purchase/purPlan/purPlanSearchDetails.vue   | 11 +++++++----
 8 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 47e90139..d209f197 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -524,7 +524,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.actDateRange = [];
       this.getInvList(this);
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index bd10ed60..3cd647b8 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -431,7 +431,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.actDateRange = [];
       this.getInvList(this);
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 1bbb260c..d1cb9aa2 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -624,7 +624,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        pageType: this.$route.query.pageType
+        pageType: this.$route.query.pageType,
+        productType: 1,
       };
       this.actAuditDateRange = [];
       this.actDateRange = [];
diff --git a/src/views/purchase/purOrder/purOrderSearchDetails.vue b/src/views/purchase/purOrder/purOrderSearchDetails.vue
index 017a1d21..58d7e6cb 100644
--- a/src/views/purchase/purOrder/purOrderSearchDetails.vue
+++ b/src/views/purchase/purOrder/purOrderSearchDetails.vue
@@ -368,7 +368,8 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index edaa94cc..98755f4a 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
@@ -69,6 +69,7 @@
         <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList">
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
                           :label="item.columnDesc+`:`" :key="item.id">
               <el-input
@@ -135,13 +136,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
           <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增采购计划
@@ -430,7 +432,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       pId: null,
       isChang: false,
       filterQuery: {
@@ -539,7 +541,8 @@ export default {
         editStatus: 1,
         deptCode: this.invCodebe,
         invCode: null,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.actDateRange = [];
       this.getInvList(this)
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 0f43d713..e2b34ea6 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch"  :model="filterQuery" class="query-form" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 "  :model="filterQuery" class="query-form" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="采购单号">-->
@@ -68,6 +68,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -129,13 +130,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -406,7 +408,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
@@ -517,7 +519,8 @@ export default {
         editStatus: 1,
         deptCode: this.invCodebe,
         invCode:null,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.getInvList(this)
       this.actDateRange = [];
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 778e823a..b98a8e77 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form v-if="queryList && queryList.length > 0 && showSearch"  :model="filterQuery" class="query-form" label-width="100px" size="mini">
+      <el-form v-if="queryList && queryList.length > 0 "  :model="filterQuery" class="query-form" label-width="100px" size="mini">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="采购单号">-->
@@ -82,6 +82,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -155,13 +156,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -489,7 +491,7 @@ export default {
       },
       invList:{},
       deptList:{},
-      showSearch:true,
+      showSearch:false,
       invCodebe:null,
       idQuery: {},
       editType: 1,
@@ -602,7 +604,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.getInvList(this);
       this.actDateRange = [];
diff --git a/src/views/purchase/purPlan/purPlanSearchDetails.vue b/src/views/purchase/purPlan/purPlanSearchDetails.vue
index 1a88ad91..705b6b06 100644
--- a/src/views/purchase/purPlan/purPlanSearchDetails.vue
+++ b/src/views/purchase/purPlan/purPlanSearchDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form  v-if="queryList && queryList.length > 0 && showSearch":model="filterQuery" class="query-form" label-width="100px">
+      <el-form  v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="6">-->
 <!--            <el-form-item label="采购单号:">-->
@@ -64,6 +64,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -125,13 +126,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -260,7 +262,7 @@ export default {
   data() {
     return {
       pageType: null,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billNo: null,
         productId: null,
@@ -361,7 +363,8 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 1,
       };
       this.actDateRange = [];
       this.getList();