From ad335f50b609c13e77fe1d00e9ef7375e991f332 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 19 Nov 2024 11:50:15 +0800
Subject: [PATCH] =?UTF-8?q?11/19=20=E5=99=A8=E6=A2=B0=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=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/basic/collectPoint/userWorkplace.vue |  1 +
 src/views/basic/product/product.vue            | 12 ++++++++----
 src/views/basic/product/udiInfoManageSp.vue    |  8 +++++---
 src/views/inout/IoAuditedOrder.vue             |  8 +++++---
 src/views/inout/IoCheckAuditOrder.vue          |  8 +++++---
 src/views/inout/IoCheckErrorOrder.vue          | 10 +++++++---
 src/views/inout/IoCheckSuccessOrder.vue        |  8 +++++---
 src/views/inout/IoCreateBusOrder.vue           |  8 +++++---
 src/views/inout/IoCreateOrder.vue              |  8 +++++---
 src/views/inout/IoCreateScanOrder.vue          |  8 +++++---
 src/views/inout/IoDealOrder.vue                |  8 +++++---
 11 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 7e02d130..cc641a37 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -416,6 +416,7 @@ export default {
       }
       this.getUsers()
       this.workList = []
+      this.employeeName = '用户'
     },
     onSubmit() {
       this.workList = []
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index c64f9319..8bd5c8c3 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row type="flex">
         <el-col style="flex: 1" v-show="Dictionary  && vueRouteSource==1">
-          <el-col v-show="showSearch" style="min-width: 200px; max-width: 100%">
+          <el-col v-show="showSearch1" style="min-width: 200px; max-width: 100%">
             <el-tree
               :data="treeList"
               class="tree"
@@ -37,7 +37,7 @@
         </el-button>
         <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
           <el-form
-            v-if="queryList && queryList.length > 0 && showSearch"
+            v-if="queryList && queryList.length > 0 "
             :model="filterQuery"
             size="mini"
             label-width="100px"
@@ -193,6 +193,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
@@ -260,13 +261,14 @@
                     :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 type="primary" icon="el-icon-refresh" @click="onReset"
@@ -1921,6 +1923,7 @@ import {postThirdProduct} from "@/api/thrsys/thrProductsExport";
 import {
   getHead, executeFuc
 } from "@/utils/customConfig";
+import fa from 'element-ui/src/locale/lang/fa'
 
 export default {
   name: "prodcut",
@@ -1957,7 +1960,8 @@ export default {
       selectHospProductVisible: false,
       selectUnBindHospProductVisible: false,
       loading: false,
-      showSearch: true,
+      showSearch: false,
+      showSearch1:true,
       productType: null,
       editQuery: null,
       editFormat: {},
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 4578607e..3674323c 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -1,9 +1,10 @@
 <template>
   <div>
     <el-card>
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="120px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" label-width="120px">
         <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
@@ -71,6 +72,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
         <!--        <el-row>-->
@@ -159,7 +161,7 @@
 
       <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="search">查询</el-button>
           <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
@@ -364,7 +366,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         lockStatus: null,
         unionCode: null,
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index c750f4b7..764e8bb2 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.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" size="mini" label-width="100px">
+      <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="单号:">-->
@@ -97,6 +97,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]"
@@ -171,12 +172,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"
@@ -982,7 +984,7 @@ export default {
       currentManufacturer: {},
       imgList: [],
       imgListCold: [],
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       filterQuery: {
         id: "",
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 21df10e3..e1e43a85 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.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"
                size="mini" label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
@@ -80,6 +80,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
@@ -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"
@@ -1263,7 +1265,7 @@ export default {
       imgViewerVisibleCold: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       IMAGE_URL: process.env.VUE_APP_SYNC_API,
-      showSearch: true,
+      showSearch: false,
 
       filterQuery: {
         id: "",
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 7132e1b1..8e73c556 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 && showSearch" :model="filterQuery" class="query-form"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
@@ -101,6 +101,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
@@ -168,12 +169,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"
@@ -1166,7 +1168,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
@@ -1180,6 +1182,7 @@ export default {
         endTime: null,
         fromCorp: null,
         invCode: this.$store.getters.locInvCode,
+        productType:1
       },
       fromOptions: [],
       checkStatus: {
@@ -1326,6 +1329,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType:1
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 3e001efd..540ba8a6 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.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" size="mini" label-width="100px">
+      <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="单号:">-->
@@ -80,6 +80,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]"
@@ -142,12 +143,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"
@@ -927,7 +929,7 @@ export default {
       imgListCold: [],
       imgViewerVisible: false,
       imgViewerVisibleCold: false,
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       currentManufacturer: {},
       filterQuery: {
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index a4257c1b..a946cad8 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery"
                :rules="rules"
                ref="form"
                class="query-form" size="mini" label-width="100px">
@@ -103,6 +103,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]"
@@ -165,12 +166,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"
@@ -417,7 +419,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       titleMap: {
         add: "新增单据",
         edit: "编辑单据",
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index d7bf9250..8f173935 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.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" size="mini" label-width="100px">
+      <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="单号:">-->
@@ -123,6 +123,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]"
@@ -185,12 +186,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"
@@ -423,7 +425,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 5f0faaff..67b1fabe 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 && showSearch"  :model="filterQuery" class="query-form" size="mini" label-width="100px">
+      <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="单号:">-->
@@ -124,6 +124,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"
@@ -416,7 +418,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 5b1fa31e..b295ba34 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 && showSearch"  :model="filterQuery" class="query-form" size="mini" label-width="100px">
+      <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="单号:">-->
@@ -100,6 +100,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]"
@@ -162,12 +163,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"
@@ -522,7 +524,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,