工单制定优化

itdmWeb/src/api/api.js

@@ -36,6 +36,11 @@ const loadAllRoleIds = (params)=>getAction("/sys/permission/loadAllRoleIds",para
 const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleListByPermId",params);
 const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params);
 
+// 委托信息——委托单位下拉列表
+const getWeituoClientList = (params)=>getAction("/weituo/itdmWeituoInfo/distinctClientList",params);
+// 委托信息——根据委托单位查询委托信息列表
+const getWeituoInfoListByClient = (params)=>getAction("/weituo/itdmWeituoInfo/weituoNoList",params);
+
 // 部门管理
 const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
 const queryDepartTreeSync = (params)=>getAction("/sys/sysDepart/queryDepartTreeSync",params);
@@ -185,7 +190,9 @@ export {
   saveProject,
   getXmjlList,
   saveProjectJl,
-  delProjectJl
+  delProjectJl,
+  getWeituoClientList,
+  getWeituoInfoListByClient
 }
 
 

itdmWeb/src/views/module-iTDM/itdmGongdanDetail/ItdmGongdanDetailList.vue

@@ -5,10 +5,29 @@
       <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="工单id">
-              <a-input placeholder="请输入工单id" v-model="queryParam.woId"></a-input>
+            <a-form-item label="委托单位名称">
+              <a-select
+                v-model="queryParam.weituoClient"
+                label-in-value
+                :options="weituoClientOptions"
+                @change="getWeituoClientOptions"
+              ></a-select>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="委托编号">
+              <a-select
+                v-model="queryParam.weituoId"
+                key-in-value
+                :options="weituoNoOptions"
+              ></a-select>
+            </a-form-item>
+          </a-col>
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="工单id">-->
+<!--              <a-input placeholder="请输入工单id" v-model="queryParam.woId"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
 <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
 <!--            <a-form-item label="实绩设备id">-->
 <!--              <j-search-select-tag placeholder="请选择实绩设备id" v-model="queryParam.shijiShebeiId" dict="itdm_device,device_name,id"/>-->
@@ -141,19 +160,33 @@ import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ItdmGongdanDetailModal from './modules/ItdmGongdanDetailModal'
 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+import { getWeituoClientList } from '@/api/api'
+import { getWeituoInfoListByClient } from '@/api/api'
+
 
 export default {
   name: 'ItdmGongdanDetailList',
   mixins:[JeecgListMixin, mixinDevice],
   components: {
-    ItdmGongdanDetailModal
+    ItdmGongdanDetailModal,
   },
+
   data () {
     return {
-      /* 排序参数 */
-      isorter: {
+      weituoClientQuery: {
+        weituoClient: '',
+      },
+      weituoClientOptions : [],
+      weituoNoQuery: {
+        weituoNo: '',
+      },
+      weituoIdQuery: {
+        weituoId: '',
+      },
+      weituoNoOptions:[],
+      isorter: { // 排序参数
         column: 'woId,workDate', // 排序字段
-        order: 'asc,asc' // 正序or倒叙
+        order: 'asc,asc' // 正序asc  or  倒叙desc
       },
       description: '工单detail管理页面',
       // 表头
@@ -169,6 +202,16 @@ export default {
           }
         },
         {
+          title:'委托单位',
+          align:"center",
+          dataIndex: 'weituoClient'
+        },
+        {
+          title:'委托编号',
+          align:"center",
+          dataIndex: 'weituoNo'
+        },
+        {
           title:'检测项目',
           align:"center",
           dataIndex: 'testItemsId_dictText'
@@ -266,7 +309,7 @@ export default {
           dataIndex: 'createTime'
         },
         // {
-        //   title:'备注',
+        //   title:'备注',F
         //   align:"center",
         //   dataIndex: 'remark'
         // },
@@ -293,6 +336,7 @@ export default {
   },
   created() {
     this.getSuperFieldList();
+    this.getClientList();
   },
   computed: {
     importExcelUrl: function(){
@@ -300,6 +344,34 @@ export default {
     },
   },
   methods: {
+    // 获得委托单位下拉列表，此方法要在created里，初始化时调用
+    getClientList(){
+      getWeituoClientList().then((res) =>{
+        console.log(res)
+        this.weituoClientOptions = res.result.map( res => {
+          return{
+            value: res,
+            label: res
+          }
+        })
+      })
+    },
+    // 监听触发方法
+    getWeituoClientOptions(value){
+      console.log(value);
+      this.weituoClientQuery.weituoClient = value.key;
+      console.log('this.weituoClientQuery',this.weituoClientQuery);
+      console.log('this.weituoClientQuery.weituoClient',this.weituoClientQuery.weituoClient);
+      getWeituoInfoListByClient(this.weituoClientQuery).then((res) =>{
+        console.log("this.weituoNoOptions",this.weituoNoOptions),
+        this.weituoNoOptions = res.result.map( res => {
+          return{
+            value: res.id,  //传的值
+            label: res.weituoNo,  //展示
+          }
+        })
+      })
+    },
     initDictConfig(){
     },
     getSuperFieldList(){