From 4b2a752c6f495cb9891e837ec178a5b2e3f33b78 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 18 Nov 2024 19:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0=2011/18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoCheckErrorOrder.vue         |  8 +++++---
 src/views/inout/IoCreateBusOrder.vue          |  8 +++++---
 src/views/inout/IoCreateScanOrder.vue         |  8 +++++---
 src/views/inout/IoDealOrder.vue               |  8 +++++---
 src/views/inout/IoSupAduitOrder.vue           |  8 +++++---
 src/views/inout/IoSupSearchOrder.vue          | 11 ++++++----
 src/views/inout/IoSupSecAuditOrder.vue        | 20 +++++--------------
 .../distribution/IoSupSearchOrder.vue         |  9 ++++++---
 .../inout/IoReturnedSearchOrderDrug.vue       |  2 ++
 .../purOderDrug/purOrderSearchDrug.vue        |  2 ++
 .../purchase/purOrder/purOrderSearch.vue      |  8 +++++---
 .../products/supAddDiProductSelectUdi.vue     |  1 +
 12 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index fd45557..03e7efb 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-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]"
@@ -144,12 +145,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -1138,7 +1140,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 8b41aab..136ced9 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -4,7 +4,7 @@
       <el-form v-if="queryList && queryList.length > 0" :model="filterQuery"
                :rules="rules"
                ref="form"
-               class="query-form" size="mini" label-width="100px" v-show="showSearch">
+               class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -85,6 +85,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]"
@@ -147,12 +148,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -396,7 +398,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       titleMap: {
         add: "新增单据",
         edit: "编辑单据",
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index f373343..c1441b8 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0"  :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0"  :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-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]"
@@ -144,12 +145,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -358,7 +360,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       titleMap: {
         add: "新增单据",
         edit: "编辑单据",
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index b725d4a..5d28528 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-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]"
@@ -144,12 +145,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -505,7 +507,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 0734472..4289a84 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-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]"
@@ -144,12 +145,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -950,7 +952,7 @@ export default {
       imgListCold: [],
       imgViewerVisible: false,
       imgViewerVisibleCold: false,
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       currentManufacturer: {},
       filterQuery: {
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 2ad494a..c403c55 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form  v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form  v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="6">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -112,6 +112,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]"
@@ -186,12 +187,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -1024,7 +1026,7 @@ export default {
       imgViewerVisibleCold: false,
       imgList: [],
       imgListCold: [],
-      showSearch: true,
+      showSearch: false,
       currentManufacturer: {},
       Upinvoice: false,
       filterQuery: {
@@ -1039,6 +1041,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
         sourceLocalType: "1",
+        productType: 1
       },
 
       reviceStatus: {
@@ -1188,7 +1191,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
         sourceLocalType: "1",
-
+        productType: 1
       };
       this.actDateRange = [];
       this.auditDateRange = [];
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index e1b4c9d..0318ae9 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -96,6 +96,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]"
@@ -158,12 +159,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -213,18 +215,6 @@
 <!--              }}-->
 <!--            </el-tag>-->
 <!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        &lt;!&ndash;        <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
-<!--        &lt;!&ndash;                reviceStatus[scope.row.status]&ndash;&gt;-->
-<!--        &lt;!&ndash;              }}&ndash;&gt;-->
-<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        <el-table-column label="操作" width="200" fixed="right">-->
 <!--          <template slot-scope="scope">-->
 <!--            <el-button-->
 <!--              type="text"-->
@@ -995,7 +985,7 @@ export default {
       imgListCold:[],
       imgViewerVisible: false,
       imgViewerVisibleCold:false,
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       currentManufacturer: {},
       filterQuery: {
diff --git a/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue b/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue
index 2da1d65..a17dc0a 100644
--- a/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form  v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form  v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="6">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -112,6 +112,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]"
@@ -186,12 +187,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -1024,7 +1026,7 @@ export default {
       imgViewerVisibleCold: false,
       imgList: [],
       imgListCold: [],
-      showSearch: true,
+      showSearch: false,
       currentManufacturer: {},
       Upinvoice: false,
       filterQuery: {
@@ -1189,6 +1191,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
         sourceLocalType: "1",
+        productType: 2
 
       };
       this.actDateRange = [];
diff --git a/src/views/pharmaceuticals/inout/IoReturnedSearchOrderDrug.vue b/src/views/pharmaceuticals/inout/IoReturnedSearchOrderDrug.vue
index 005013d..e284025 100644
--- a/src/views/pharmaceuticals/inout/IoReturnedSearchOrderDrug.vue
+++ b/src/views/pharmaceuticals/inout/IoReturnedSearchOrderDrug.vue
@@ -122,6 +122,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]"
@@ -197,6 +198,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderSearchDrug.vue b/src/views/pharmaceuticals/purOderDrug/purOrderSearchDrug.vue
index cbf7929..f007733 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderSearchDrug.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderSearchDrug.vue
@@ -119,6 +119,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]"
@@ -183,6 +184,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 10302c5..dc94fc9 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -7,7 +7,6 @@
         class="query-form"
         label-width="100px"
         size="mini"
-        v-show="showSearch"
       >
         <!-- <el-row>
           <el-col :span="8">
@@ -120,6 +119,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]"
@@ -184,13 +184,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 type="primary" icon="el-icon-refresh" @click="onReset"
@@ -561,7 +562,7 @@ export default {
       filePath: "",
       createTimes: null,
       auditTimes: null, //发布时间 选择器
-      showSearch: true,
+      showSearch: false,
       formName: null,
       formMap: {
         add: "新增采购订单",
@@ -693,6 +694,7 @@ export default {
         corpName: null,
         type: "1",
         editStatus: "1",
+        productType: 1
       };
       this.auditTimes = [];
       this.detailList = [];
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 5d0c7fc..c8b7fc6 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -766,6 +766,7 @@ export default {
       devKeys.push(this.curSelectDi.deviceRecordKey)
       this.editQuery.uuids = uuids
       this.editQuery.devKeys = devKeys
+      this.editQuery.productsType = 1
       this.editQuery.sourceType = 0
       this.$refs.editQuery.validate((valid) => {
         if (valid) {