高级搜索修改

src/views/collect/chooseDraftOrderDialog.vue

@@ -1,10 +1,11 @@
 <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 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)"
                             class="query-form-item"
                             :label="item.columnDesc+`:`" :key="item.id">
@@ -77,32 +78,35 @@
                   :placeholder="item.columnDesc"
                 ></el-date-picker>
               </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
-      <div class="left-search" v-if="!showSearch">
+      <!--      <div class="left-search" v-if="!showSearch">-->
-        <!-- 关键字搜索 按需配置 -->
+      <!--        &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
-        <el-form v-if="queryList && queryList.length > 0" :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"-->
-          <el-row style=" display:flex;  flex-wrap: wrap; ">
+      <!--                 label-width="100px">-->
-            <template v-for="(item, index) in queryList">
+      <!--          <el-row style=" display:flex;  flex-wrap: wrap; ">-->
-              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+      <!--            <template v-for="(item, index) in queryList">-->
-                            class="query-form-item"
+      <!--              <el-form-item-->
-                            :label="item.columnDesc+`:`" :key="item.id">
+      <!--                v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
-                <el-input
+      <!--                class="query-form-item"-->
-                  v-model="filterQuery[item.columnName]"
+      <!--                :label="item.columnDesc+`:`" :key="item.id">-->
-                  :placeholder="item.columnDesc"
+      <!--                <el-input-->
-                  :disabled="executeEval(null,item.disabledFuc,false)"
+      <!--                  v-model="filterQuery[item.columnName]"-->
-                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+      <!--                  :placeholder="item.columnDesc"-->
-                  clearable
+      <!--                  :disabled="executeEval(null,item.disabledFuc,false)"-->
-                ></el-input>
+      <!--                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
-              </el-form-item>
+      <!--                  clearable-->
-            </template>
+      <!--                ></el-input>-->
-          </el-row>
+      <!--              </el-form-item>-->
-        </el-form>
+      <!--            </template>-->
-      </div>
+      <!--          </el-row>-->
+      <!--        </el-form>-->
+      <!--      </div>-->
       <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"
@@ -197,7 +201,7 @@
             :key="item.columnName"
             fixed="right"
           >
-            <template slot- ="scope">
+            <template slot-="scope">
               <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
                          :type="buttonItem.type"
                          :size="buttonItem.size"
@@ -696,7 +700,7 @@ import {convertDate} from "@/utils/date";
 import {isBlank} from "@/utils/strUtil";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeList} from "@/api/inout/code";
-import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
+import {listPage} from '@/api/basic/workPlace/sysWorkplaceManage'
 
 export default {
   name: "chooseDraftOrderDialog",
@@ -1189,15 +1193,15 @@ export default {
 
 
     //选入
-    choose(){
+    choose() {
-      if (this.currentRow.billNo == null){
+      if (this.currentRow.billNo == null) {
         return this.$message.error("请选择单据")
       }
       this.closeChooseDialog()
       this.handleChoose(this.currentRow)
     },
     //获取当前工位
-    findCurWorkPlaces(_this,val) {
+    findCurWorkPlaces(_this, val) {
       let query = {
         key: val,
         status: 1,
@@ -1213,7 +1217,7 @@ export default {
             label: item.workplaceName
           };
         })
-        if (_this.options.getWorkPlaceList .length == 1){
+        if (_this.options.getWorkPlaceList.length == 1) {
           _this.filterQuery.workPlaceCode = _this.options.getWorkPlaceList[0].code;
         }
       })
@@ -1229,7 +1233,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    this.findCurWorkPlaces(this,"");
+    this.findCurWorkPlaces(this, "");
 
     this.splitType = this.$route.query.splitType;
     if (this.splitType == "search") {

src/views/collect/selectCollectOrderDialog.vue

@@ -11,7 +11,7 @@
                             :label="item.columnDesc+`:`" :key="item.id">
                 <el-input
                   v-model="filterQuery[item.columnName]"
-                  :placeholder="item.columnDesc"
+                  :placeholder="item.columnDesc == '搜索' ? '单据号/所属工位/业务名称/收货方/发货方' : item.columnDesc"
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                   clearable