From 49bf24e8d6e14e419e396e8c0a01ded0efdb921a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 19 Nov 2024 15:17:10 +0800
Subject: [PATCH] =?UTF-8?q?11/19=20=E5=99=A8=E6=A2=B0=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E8=8D=AF=E5=93=81=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/receive/receiveAdd.vue                  | 9 ++++++---
 src/views/inout/receive/receiveAudit.vue                | 8 +++++---
 src/views/inout/receive/receiveMySearch.vue             | 9 ++++++---
 src/views/inout/receive/receiveSearch.vue               | 8 +++++---
 src/views/pharmaceuticals/receive/receiveAddDrug.vue    | 9 ++++++---
 src/views/pharmaceuticals/receive/receiveAuditDrug.vue  | 8 +++++---
 src/views/pharmaceuticals/receive/receiveMySearch.vue   | 4 +++-
 src/views/pharmaceuticals/receive/receiveSearchDrug.vue | 2 +-
 8 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index f36ea843..a944d196 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="领用单号:">-->
@@ -59,6 +59,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]"
@@ -120,13 +121,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">
@@ -397,7 +399,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billType: null,
         billNo: "",
@@ -505,6 +507,7 @@ export default {
         editStatus: 1,
         thirdPartyDate: 2,
         invCode: this.invCodebe,
+        productType: 1,
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 4689887e..33c229a0 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.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="领用单号:">-->
@@ -46,6 +46,7 @@
 
         <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]"
@@ -107,13 +108,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>
@@ -381,7 +383,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
diff --git a/src/views/inout/receive/receiveMySearch.vue b/src/views/inout/receive/receiveMySearch.vue
index f7a87403..a88560df 100644
--- a/src/views/inout/receive/receiveMySearch.vue
+++ b/src/views/inout/receive/receiveMySearch.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="领用单号:">-->
@@ -76,6 +76,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]"
@@ -149,13 +150,15 @@
                 :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>
@@ -456,7 +459,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 62e92a87..89414e23 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.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="领用单号:">-->
@@ -83,6 +83,7 @@
 
         <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]"
@@ -156,12 +157,13 @@
                 :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>
@@ -447,7 +449,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
diff --git a/src/views/pharmaceuticals/receive/receiveAddDrug.vue b/src/views/pharmaceuticals/receive/receiveAddDrug.vue
index ee8d737f..10194a61 100644
--- a/src/views/pharmaceuticals/receive/receiveAddDrug.vue
+++ b/src/views/pharmaceuticals/receive/receiveAddDrug.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="领用单号:">-->
@@ -59,6 +59,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]"
@@ -120,13 +121,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">
@@ -398,7 +400,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billType: null,
         billNo: "",
@@ -507,6 +509,7 @@ export default {
         editStatus: 1,
         thirdPartyDate: 2,
         invCode: this.invCodebe,
+        productType: 2,
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/pharmaceuticals/receive/receiveAuditDrug.vue b/src/views/pharmaceuticals/receive/receiveAuditDrug.vue
index 5597c780..2dba0ed5 100644
--- a/src/views/pharmaceuticals/receive/receiveAuditDrug.vue
+++ b/src/views/pharmaceuticals/receive/receiveAuditDrug.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="领用单号:">-->
@@ -46,6 +46,7 @@
 
         <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]"
@@ -107,13 +108,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>
@@ -381,7 +383,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
diff --git a/src/views/pharmaceuticals/receive/receiveMySearch.vue b/src/views/pharmaceuticals/receive/receiveMySearch.vue
index a4eb1ae8..83276abc 100644
--- a/src/views/pharmaceuticals/receive/receiveMySearch.vue
+++ b/src/views/pharmaceuticals/receive/receiveMySearch.vue
@@ -470,7 +470,8 @@ export default {
         corpName: null,
         type: 3,
         editStatus: 2,
-        invCode: null
+        invCode: null,
+        productType: 2,
       },
       statusMap: {
         1: "草稿",
@@ -601,6 +602,7 @@ export default {
         type: 3,
         editStatus: 2,
         invCode: this.invCodebe,
+        productType: 2,
       };
       this.actDateRange = [];
       this.actAuditDateRange = [];
diff --git a/src/views/pharmaceuticals/receive/receiveSearchDrug.vue b/src/views/pharmaceuticals/receive/receiveSearchDrug.vue
index 472b7a9c..a3ba5b6d 100644
--- a/src/views/pharmaceuticals/receive/receiveSearchDrug.vue
+++ b/src/views/pharmaceuticals/receive/receiveSearchDrug.vue
@@ -84,7 +84,6 @@
         <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]"
@@ -591,6 +590,7 @@ export default {
         corpName: null,
         type: 3,
         targetInvCode: this.invCodebe,
+        productType: 2,
       };
       this.actDateRange = [];
       this.actAuditDateRange = [];