Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

# Conflicts:
#	src/views/basic/workplace/addBusTypeDialog.vue

src/views/basic/workplace/addBusTypeDialog.vue

@@ -13,6 +13,14 @@
 <!--            ></el-input>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
+        <el-col :span="12" class="el-col">
+          <el-form-item label="业务名称:" prop="busName" class="query-form-item">
+            <el-input
+              v-model="formData.busName" style="width: 80%"
+              auto-complete="off"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="12" class="el-col">
           <el-form-item label="是否配套系统:" prop="isMatching" class="query-form-item">
             <el-select v-model="formData.isMatching" style="width: 80%" placeholder="是否配套系统"
@@ -42,14 +50,14 @@
         </el-col>
       </el-row>
       <el-row :gutter="24" class="el-row">
-        <el-col :span="12" class="el-col">
-          <el-form-item label="业务名称:" prop="busName" class="query-form-item">
-            <el-input
-              v-model="formData.busName" style="width: 80%"
-              auto-complete="off"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12" class="el-col">-->
+        <!--  <el-form-item label="业务名称:" prop="busName" class="query-form-item">-->
+        <!--    <el-input-->
+        <!--      v-model="formData.busName" style="width: 80%"-->
+        <!--      auto-complete="off"-->
+        <!--    ></el-input>-->
+        <!--  </el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12" class="el-col">
           <el-form-item label="计量单位:" prop="orderCirType" class="query-form-item">
             <el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择计量单位">

src/views/basic/workplace/workplaceManage.vue

@@ -85,7 +85,7 @@
                 <el-col :span="8">
                   <el-form-item label="工位状态:" class="query-form-item">
                     <el-select v-model="query.workplaceStatus" placeholder="工位状态" clearable>
-                      <el-option label="停用" :value="0"></el-option>
+                      <el-option label="暂停" :value="0"></el-option>
                       <el-option label="在用" :value="1"></el-option>
                     </el-select>
                   </el-form-item>

src/views/collect/DealOrder.vue

@@ -633,7 +633,6 @@ export default {
       event.currentTarget.select();
       ``
     },
-    //todo  前端执行区分分两个接口不要用同一个接口
 
 
     enterKey() {

src/views/collect/PanelOrderDeal.vue

@@ -80,6 +80,26 @@
           </template>
         </el-row>
       </el-form>
+      <div class="right-search" v-if="!showSearch">
+        <!-- 关键字搜索 按需配置 -->
+        <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">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+                            class="query-form-item"
+                            :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </template>
+          </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>
@@ -286,7 +306,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         billNo: null,

src/views/collect/PanelOrderEndSearch.vue

@@ -88,6 +88,26 @@
           </template>
         </el-row>
       </el-form>
+      <div class="right-search" v-if="!showSearch">
+        <!-- 关键字搜索 按需配置 -->
+        <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">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+                            class="query-form-item"
+                            :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </template>
+          </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>
@@ -305,7 +325,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         tagStatus: 3,

src/views/collect/PanelOrderUpload.vue

@@ -88,6 +88,26 @@
           </template>
         </el-row>
       </el-form>
+      <div class="right-search" v-if="!showSearch">
+        <!-- 关键字搜索 按需配置 -->
+        <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">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+                            class="query-form-item"
+                            :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </template>
+          </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>
@@ -320,7 +340,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         tagStatus: null,