fix: 数据确认查询

itdmWeb/src/views/module-iTDM/gongdanshuju/ItdmGongdanShujuList.vue

@@ -6,27 +6,30 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="委托单位名称">
-              <j-search-select-tag placeholder="请选择委托单位名称" :dictOptions="weituoClientList" @change="handlewcChange"/>
+              <j-search-select-tag placeholder="请选择委托单位名称" value="" :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="请选择委托编号" :dictOptions="weituoNoList" @change="handlewnChange"/>
+              <j-search-select-tag placeholder="请选择委托编号"  v-model="weituoId" :dictOptions="weituoNoList" @change="handlewnChange"/>
             </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.woId" :dictOptions="gongdanList" @change="handlegdChange"/>
+            <a-form-item label="日期">
+              <j-search-select-tag placeholder="请选择日期"  :dictOptions="gongdanDateList" @change="handlegddChange"/>
             </a-form-item>
           </a-col>
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="日期">
-              <j-search-select-tag placeholder="请选择日期"  :dictOptions="gongdanDateList" @change="handlegddChange"/>
+            <a-form-item label="工单号">
+              <j-search-select-tag placeholder="请选择工单"  v-model="queryParam.woId" :dictOptions="gongdanList" @change="handlegdChange"/>
             </a-form-item>
           </a-col>
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="试验类型">
-              <j-multi-select-tag placeholder="请选择试验类型" dictCode="shiiyan_type" v-model="queryParam.shiyanType"/>
+              <j-multi-select-tag ref="shiyanType"  placeholder="请选择试验类型" dictCode="shiiyan_type" v-model="queryParam.shiyanType"/>
             </a-form-item>
           </a-col>
            <template v-if="toggleSearchStatus">
@@ -35,6 +38,7 @@
           <a-time-picker
             style="width: 100%"
             format="HH:mm"
+            :valueFormat="'HH:mm'"
             v-model="queryParam.shiyanKaishitime"
             placeholder="请选择试验开始时间"
           />
@@ -45,6 +49,7 @@
           <a-time-picker
             style="width: 100%"
             format="HH:mm"
+            :valueFormat="'HH:mm'"
             v-model="queryParam.shiyanJieshutime"
             placeholder="请选择结束时间"
           />
@@ -163,7 +168,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ItdmGongdanShujuModal from './modules/ItdmGongdanShujuModal'
   import {filterMultiDictText} from '@comp/dict/JDictSelectUtil'
-  
+
   export default {
     name: 'ItdmGongdanShujuList',
     mixins:[JeecgListMixin, mixinDevice],
@@ -172,6 +177,7 @@
     },
     data () {
       return {
+        weituoId:'',
         weituoClientList:[],
         weituoNoList:[],
         gongdanList:[],
@@ -278,7 +284,7 @@
           exportXlsUrl: "/itdmgongdanshuju/itdmGongdanShuju/exportXls",
           importExcelUrl: "itdmgongdanshuju/itdmGongdanShuju/importExcel",
           add: "/itdmgomgongdanshuju/ItdmGongdanshuju/add",
-      
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -308,7 +314,7 @@
         })
 
       },
-      
+
       handlewcChange(data){
 
       var weituoClient={weituoClient:data}
@@ -327,15 +333,35 @@
 
       handlewnChange(data){
 
+
+
+        //gongdanDateList
         var weituoClient={weituoId:data}
-        getAction('/gongdandetail/itdmGongdanDetail/gongdanIdList', weituoClient).then((res) => {
+
+
+
+
+
+        // getAction('/gongdandetail/itdmGongdanDetail/gongdanIdList', weituoClient).then((res) => {
+        //   if (res.success) {
+        //     console.log("=========================")
+        //     console.log(res.result)
+        //     this.gongdanList = res.result.map(i=>{
+        //       return { value: i, text: i}
+        //     })
+        //     console.log(this.gongdanList)
+        //   }
+        // })
+
+
+        getAction('/gongdandetail/itdmGongdanDetail/gongdanWorkdateList', weituoClient).then((res) => {
           if (res.success) {
             console.log("=========================")
             console.log(res.result)
-            this.gongdanList = res.result.map(i=>{
+            this.gongdanDateList = res.result.map(i=>{
               return { value: i, text: i}
             })
-            console.log(this.gongdanList)
+            console.log(this.gongdanDateList)
           }
         })
 
@@ -344,36 +370,57 @@
       },
 
       handlegdChange(data){
-
-          var woId={woId:data}
-          getAction('/gongdandetail/itdmGongdanDetail/gongdanDateListByWoId', woId).then((res) => {
+        var woId={woId:data}
+        getAction('/gongdandetail/itdmGongdanDetail/gongdanDateListByWoId', woId).then((res) => {
           if (res.success) {
             console.log("****************")
-            console.log(res.result)
-            this.gongdanDetailList = res.result;
-            console.log(this.gongdanDetailList)
-            this.gongdanDateList = res.result.map(i=>{
-              return { value: i.shijiWorkDate, text: i.shijiWorkDate}
-            })
-        
-            
+            this.$refs.shiyanType.onChange([])
+            this.queryParam.shiyanType=[]
+
+            for (const key in  res.result) {
+              this.queryParam.shiyanType = res.result[key].shijiShiiyanType;
+              this.queryParam.shiyanKaishitime = res.result[key].shijiStartTime;
+              this.queryParam.shiyanJieshutime = res.result[key].shijiEndTime;
+              console.log(this.queryParam)
+
+
+            }
           }
         })
 
+
+
+
       },
       handlegddChange(data) {
         console.log(data);
-        for (const key in this.gongdanDetailList) {
-    
-          if(this.gongdanDetailList[key].shijiWorkDate === data) {
-            
-            this.queryParam.shiyanType = this.gongdanDetailList[key].shijiShiiyanType;
-            this.queryParam.shiyanKaishitime = this.gongdanDetailList[key].shijiStartTime;
-            this.queryParam.shiyanJieshutime = this.gongdanDetailList[key].shijiEndTime;
-            console.log(this.queryParam)
+        //gongdanList
+        var weituoClient={weituoId:this.weituoId,workdate:data}
+
+        getAction('/gongdandetail/itdmGongdanDetail/gongdanWoIdList', weituoClient).then((res) => {
+          if (res.success) {
+            console.log("=========================")
+            console.log(res.result)
+            this.gongdanList = res.result.map(i=>{
+              return { value: i, text: i}
+            })
+            console.log(this.gongdanList)
           }
-           
-        }
+        })
+
+
+
+        // for (const key in this.gongdanDetailList) {
+        //
+        //   if(this.gongdanDetailList[key].shijiWorkDate === data) {
+        //
+        //     this.queryParam.shiyanType = this.gongdanDetailList[key].shijiShiiyanType;
+        //     this.queryParam.shiyanKaishitime = this.gongdanDetailList[key].shijiStartTime;
+        //     this.queryParam.shiyanJieshutime = this.gongdanDetailList[key].shijiEndTime;
+        //     console.log(this.queryParam)
+        //   }
+        //
+        // }
       },
 
       initDictConfig() {
@@ -405,7 +452,7 @@
           }
            this.searchReset();
         })
-       
+
       }
     }
   }