From a290eb30e1a0b0c7c6c756cd72e072151814d0e6 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Fri, 15 Nov 2024 17:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/collectPoint/userWorkplace.vue       | 12 ++++++------
 src/views/basic/corpMaintain/corpMaintain.vue        |  2 +-
 src/views/basic/workplace/cargowWorkplaceManage.vue  |  2 +-
 src/views/basic/workplace/workplaceManage.vue        |  2 +-
 src/views/pharmaceuticals/receive/receiveAddDrug.vue |  2 +-
 .../pharmaceuticals/receive/receiveAuditDrug.vue     |  2 +-
 .../pharmaceuticals/receive/receiveMySearch.vue      |  9 ++++++---
 .../pharmaceuticals/receive/receiveSearchDrug.vue    | 10 +++++++---
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 65cfa396..7e02d130 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -2,18 +2,18 @@
   <div>
     <el-card>
       <div>
-        <el-form :inline="true" :model="userQuery" size="mini" v-if="showSearch">
-          <el-row :gutter="24">
+        <el-form  label-width="auto" :model="userQuery" size="mini" v-if="showSearch" class="order-el-form">
+          <el-row :gutter="20">
             <!--<el-col :span="6">-->
             <!--  <el-form-item label="所属部门:">-->
             <!--    <el-input v-model="userQuery.deptName" placeholder="所属部门" clearable></el-input>-->
             <!--  </el-form-item>-->
             <!--</el-col>-->
-            <el-col :span="10">
+            <el-col :span="8">
 
               <el-form-item label="当前部门:" class="query-form-item">
                 <el-select v-model="userQuery.deptCode" class="width-full" placeholder="请选择" filterable clearable
-                           @change="changeUsers"
+                           @change="changeUsers" style="width: 80%"
                 >
                   <el-option v-for="item in DeptList" :key="item.id" :label="item.name" :value="item.code"/>
                 </el-select>
@@ -28,7 +28,7 @@
             <!--    <invSelect :value.sync="userQuery.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
             <!--  </el-form-item>-->
             <!--</el-col>-->
-            <el-col :span="10">
+            <el-col :span="8">
               <el-form-item label="账号/名称:">
                 <el-input v-model="userQuery.userKey" placeholder="请输入账号/名称" clearable>
                 </el-input>
@@ -41,7 +41,7 @@
 
         <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" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           </el-button-group>
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 020131a9..6bcb92f3 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -26,7 +26,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-plus" @click.native="handleForm(null, null)"
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index f71f5c53..d38b3bcb 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -108,7 +108,7 @@
             </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" @click="onReset">重置</el-button>
                 <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
                 <el-button type="primary" icon="el-icon-plus" @click="addCargowWorkplace">新增上货工位</el-button>
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 711f9c5a..822e0346 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -109,7 +109,7 @@
             </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" @click="onReset">重置</el-button>
                 <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
                 <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增采集工位</el-button>
diff --git a/src/views/pharmaceuticals/receive/receiveAddDrug.vue b/src/views/pharmaceuticals/receive/receiveAddDrug.vue
index ae35b551..ee8d737f 100644
--- a/src/views/pharmaceuticals/receive/receiveAddDrug.vue
+++ b/src/views/pharmaceuticals/receive/receiveAddDrug.vue
@@ -126,7 +126,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="onSubmitFind">查询</el-button>
           <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
diff --git a/src/views/pharmaceuticals/receive/receiveAuditDrug.vue b/src/views/pharmaceuticals/receive/receiveAuditDrug.vue
index d454acea..5597c780 100644
--- a/src/views/pharmaceuticals/receive/receiveAuditDrug.vue
+++ b/src/views/pharmaceuticals/receive/receiveAuditDrug.vue
@@ -113,7 +113,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="onSubmitFind">查询</el-button>
         </el-button-group>
diff --git a/src/views/pharmaceuticals/receive/receiveMySearch.vue b/src/views/pharmaceuticals/receive/receiveMySearch.vue
index c931d090..a4eb1ae8 100644
--- a/src/views/pharmaceuticals/receive/receiveMySearch.vue
+++ b/src/views/pharmaceuticals/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,8 @@
 <!--        </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 +151,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>
@@ -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/pharmaceuticals/receive/receiveSearchDrug.vue b/src/views/pharmaceuticals/receive/receiveSearchDrug.vue
index 108ccf0e..472b7a9c 100644
--- a/src/views/pharmaceuticals/receive/receiveSearchDrug.vue
+++ b/src/views/pharmaceuticals/receive/receiveSearchDrug.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,8 @@
 
         <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 +158,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>
@@ -442,12 +445,13 @@ import {
   findInvByUserOptimize,
   findByFromOptimize} from "@/api/system/invSubWarehouse";
 import {executeFuc, getHead} from "@/utils/customConfig";
+import fa from 'element-ui/src/locale/lang/fa'
 
 export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",