优化

itdmWeb/src/views/module-iTDM/itdmGuoqi/itdmChuanganqiGq.vue

@@ -4,11 +4,11 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="型号">
               <a-input placeholder="请输入型号" v-model="queryParam.xinghao"></a-input>
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="序列号">
               <a-input placeholder="请输入序列号" v-model="queryParam.xuliehao"></a-input>

itdmWeb/src/views/module-iTDM/weituo/ItdmWeituoInfoWanchengList.vue

@@ -6,11 +6,16 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="委托单位名称">
-              <j-search-select-tag placeholder="请选择委托单位名称" v-model="queryParam.weituoClient"  :dictOptions="weituoClientList"/>
+              <j-search-select-tag placeholder="请选择委托单位名称" v-model="queryParam.weituoClient"  :dictOptions="weituoClientList" @change="handlewcChange"/>
               <!--              <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></a-input>-->
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="委托编号">
+              <j-search-select-tag placeholder="请选择委托编号" v-model="queryParam.weituoNo" :dictOptions="weituoNoOptions"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -101,7 +106,7 @@ import ItdmWeituoInfoModal from './modules/ItdmWeituoInfoModal'
 import { ajaxGetDictItems, loadCategoryData } from '@/api/api'
 import { filterMultiDictText } from '@comp/dict/JDictSelectUtil'
 import { getAction } from '@api/manage'
-import { checkWancheng } from '@/api/api'
+import { checkWancheng, getWeituoInfoListByClient } from '@/api/api'
 
 
 
@@ -113,7 +118,12 @@ export default {
   },
   data () {
     return {
+      queryParam: {
+        weituoClient: undefined,
+        weituoNo: undefined
+      },
       weituoClientList:[],
+      weituoNoOptions: [],
       description: '委托信息管理页面',
       // 表头
       columns: [
@@ -289,7 +299,23 @@ export default {
           this.loadData();
         })
       }
-    }
+    },
+    // 监听选中委托单位，获取该单位的委托编号
+    handlewcChange(data){
+      console.log(data)
+      this.weituoNoOptions = []
+      this.queryParam.weituoNo = undefined
+      getWeituoInfoListByClient(this.queryParam).then((res) =>{
+        console.log(res.result)
+        this.weituoNoOptions = res.result.map( res => {
+          return {
+            value: res.weituoNo,  //传的值
+            text: res.weituoNo  //展示
+          }
+        })
+        console.log(this.weituoNoOptions)
+      })
+    },
   }
 }
 </script>

itdmWeb/src/views/module-iTDM/weituochaxun/ItdmWeituoYangpinList.vue

@@ -4,9 +4,14 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="委托单位名称">
+            <a-form-item label="委托单位">
               <!-- <j-search-select-tag placeholder="请选择委托单位名称" :dictOptions="weituoClientList" @change="handlewcChange"/> -->
-              <j-search-select-tag placeholder="请选择委托单位名称" v-model="queryParam.weituoClient" :dictOptions="weituoClientList"/>
+              <j-search-select-tag placeholder="请选择委托单位名称" v-model="queryParam.weituoClient" :dictOptions="weituoClientList" @change="handlewcChange"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="委托编号">
+              <j-search-select-tag placeholder="请选择委托编号" v-model="queryParam.weituoNo" :dictOptions="weituoNoOptions"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -29,17 +34,19 @@
             >
             </a-select> -->
           <!-- </a-col> -->
-          <a-col :xl="10" :lg="11" :md="12" :sm="24">
-            <a-form-item label="选择时间">
-              <!-- <j-date :show-time="{ format: 'HH:mm:ss' }" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.startTime"></j-date>
-              <span class="query-group-split-cust"></span>
-              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.endTime"></j-date> -->
-              <a-date-picker :show-time="{ format: 'HH:mm:ss' }" class="query-group-cust" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.startTime" placeholder="请输入开始时间"/>
-              <span class="query-group-split-cust"></span>
-              <a-date-picker  format="YYYY-MM-DD HH:mm:ss" class="query-group-cust" v-model="queryParam.endTime" placeholder="请输入结束时间"/>
-            </a-form-item>
-            <!-- <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.startTime" placeholder="请输入开始时间"/> -->
-          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="选择时间">
+                <!-- <j-date :show-time="{ format: 'HH:mm:ss' }" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.startTime"></j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.endTime"></j-date> -->
+                <a-date-picker :show-time="{ format: 'HH:mm:ss' }" class="query-group-cust" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.startTime" placeholder="请输入开始时间"/>
+                <span class="query-group-split-cust"></span>
+                <a-date-picker  format="YYYY-MM-DD HH:mm:ss" class="query-group-cust" v-model="queryParam.endTime" placeholder="请输入结束时间"/>
+              </a-form-item>
+              <!-- <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.startTime" placeholder="请输入开始时间"/> -->
+            </a-col>
+          </template>
            <!-- <a-col :xl="5" :lg="7" :md="8" :sm="24">
            <a-date-picker  format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.endTime" placeholder="请输入结束时间"/>
           </a-col> -->
@@ -48,10 +55,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+              <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a> -->
+              </a>
             </span>
           </a-col>
         </a-row>
@@ -156,7 +163,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ItdmWeituoYangpinModal from './modules/ItdmWeituoYangpinModal'
   import { httpAction, getAction } from '@/api/manage'
-  import { downWeituo_info } from '@api/api'
+  import { downWeituo_info, getWeituoInfoListByClient } from '@api/api'
   export default {
     name: 'ItdmWeituoYangpinList',
     mixins:[JeecgListMixin, mixinDevice],
@@ -166,9 +173,12 @@
     data () {
       return {
         queryParam: {
-          shenheStatus: 1
+          shenheStatus: 1,
+          weituoClient: undefined,
+          weituoNo: undefined
         },
         weituoClientList:[],
+        weituoNoOptions: [],
         description: '委托样品管理页面',
         // 表头
         columns: [
@@ -345,6 +355,22 @@
         })
 
       },
+      // 监听选中委托单位，获取该单位的委托编号
+      handlewcChange(data){
+        console.log(data)
+        this.weituoNoOptions = []
+        this.queryParam.weituoNo = undefined
+        getWeituoInfoListByClient(this.queryParam).then((res) =>{
+          console.log(res.result)
+          this.weituoNoOptions = res.result.map( res => {
+            return {
+              value: res.weituoNo,  //传的值
+              text: res.weituoNo  //展示
+            }
+          })
+          console.log(this.weituoNoOptions)
+        })
+      },
 //
       // getList(){
       //   let that = this
@@ -488,6 +514,7 @@
         a.click()
       })
     },
+    
       // handlewcChange(data){
 
       // var weituoClient={weituoClient:data}