Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter

src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.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="采购单号">-->
@@ -68,6 +68,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]"
@@ -129,13 +130,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>
@@ -323,7 +325,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",

src/views/pharmaceuticals/purOderDrug/purOrderDrug.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="采购单号">-->
@@ -67,6 +67,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]"
@@ -128,13 +129,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 type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增采购订单
@@ -414,7 +416,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       pId: null,
       isChang: false,
       filterQuery: {
@@ -522,7 +524,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 2,
       };
       this.actDateRange = [];
       this.getInvList(this);

src/views/pharmaceuticals/purOderDrug/purOrderSearchDetailsDrug.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="6">-->
 <!--            <el-form-item label="采购单号:">-->
@@ -64,6 +64,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]"
@@ -125,13 +126,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>
@@ -262,7 +264,7 @@ export default {
   data() {
     return {
       pageType:null,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billNo: null,
         productId: null,
@@ -366,7 +368,8 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
-        pageType: this.pageType
+        pageType: this.pageType,
+        productType: 2,
       };
       this.actDateRange = [];
       this.getList();

src/views/pharmaceuticals/purOderDrug/purOrderSearchDrug.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px" size="mini">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" label-width="100px" size="mini">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-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]"
@@ -157,13 +158,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 type="primary" icon="el-icon-share" v-if="this.Menustatus === 1" @click="help">帮助</el-button>-->
@@ -506,7 +508,7 @@ export default {
       },
       invList: {},
       deptList: {},
-      showSearch: true,
+      showSearch: false,
       idQuery: {},
       editType: 1,
       total: 0,
@@ -622,7 +624,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        pageType: this.$route.query.pageType
+        pageType: this.$route.query.pageType,
+        productType: 2,
       };
       this.actAuditDateRange = [];
       this.actDateRange = [];