fix: bug更改

itdmWeb/src/views/module-iTDM/baogao/ItdmBaogaoList.vue

@@ -4,24 +4,25 @@
     <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-form-item label="委托编号">
-              <a-input placeholder="请输入委托编号" v-model="queryParam.weituoNo"></a-input>
+
+            <a-form-item label="委托单位名称">
+              <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="委托单位名称">
-              <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></a-input>
+            <a-form-item label="委托编号">
+              <j-search-select-tag placeholder="请选择委托编号"  v-model="queryParam.weituoNo"  :dictOptions="weituoNoList" />
             </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>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -130,6 +131,8 @@ export default {
   },
   data() {
     return {
+      weituoClientList: [],
+      weituoNoList: [],
       description: '报告生成管理页面',
       // 表头
       columns: [
@@ -164,14 +167,14 @@ export default {
         {
           title: '报告模板',
           align: 'center',
-          dataIndex: 'baogaoType_dictText',
+          dataIndex: 'baogaoType_dictText'
 
         },
         {
           title: '报告文件地址',
           align: 'center',
           dataIndex: 'filePath',
-          scopedSlots: {customRender: 'fileSlot'}
+          scopedSlots: { customRender: 'fileSlot' }
 
         },
         {
@@ -205,9 +208,38 @@ export default {
     }
   },
   methods: {
-    wordedit(record){
-      this.$refs.wordedit.edit(record);
-      this.$refs.wordedit.visible=true
+    handlewcChange(data){
+
+      var weituoClient={weituoClient:data}
+      getAction('/weituo/itdmWeituoInfo/weituoNoList', weituoClient).then((res) => {
+        if (res.success) {
+          console.log("xxxxxxxxxxxxxxxxxxx")
+          console.log(res.result)
+          this.weituoNoList = res.result.map(i=>{
+            return { value: i.weituoNo, text: i.weituoNo}
+          })
+          console.log(this.weituoNoList)
+        }
+      })
+
+    },
+
+    init() {
+
+      getAction('/weituo/itdmWeituoInfo/distinctClientList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.weituoClientList = res.result.map(i => {
+            return { value: i, text: i }
+          })
+          console.log(this.weituoClientList)
+        }
+      })
+
+    },
+    wordedit(record) {
+      this.$refs.wordedit.edit(record)
+      this.$refs.wordedit.visible = true
     },
 
     getSuperFieldList() {

itdmWeb/src/views/module-iTDM/baogao/modules/ItdmBaogaoForm.vue

@@ -3,6 +3,12 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="委托单位名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-search-select-tag placeholder="请选择委托单位名称" :dictOptions="weituoClientList"
+                                   @change="handlewcChange" />
+            </a-form-model-item>
+          </a-col>
 
           <a-col :span="24">
             <a-form-model-item label="委托信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoId">
@@ -73,23 +79,23 @@
           <a-col :span="24">
             <a-form-model-item label="报告类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="baogaoType">
 
-              <j-search-select-tag v-model="model.baogaoType" dict="itdm_moban,name,id"  />
+              <j-search-select-tag v-model="model.baogaoType" dict="itdm_moban,name,id" />
 
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="环境温度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wendu">
-              <a-input v-model="model.wendu" placeholder="请输入温度"  ></a-input>
+              <a-input v-model="model.wendu" placeholder="请输入温度"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="环境湿度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shidu">
-              <a-input v-model="model.shidu" placeholder="请输入湿度"  ></a-input>
+              <a-input v-model="model.shidu" placeholder="请输入湿度"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="环境大气压" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="daqiya">
-              <a-input v-model="model.daqiya" placeholder="请输入大气压"  ></a-input>
+              <a-input v-model="model.daqiya" placeholder="请输入大气压"></a-input>
             </a-form-model-item>
           </a-col>
 
@@ -117,7 +123,9 @@ export default {
   },
   data() {
     return {
-      yangppinLsDictOptions:[],
+      weituoClientList: [],
+
+      yangppinLsDictOptions: [],
       weituoDictOptions: [],
       yangppinDictOptions: [],
       model: {},
@@ -157,31 +165,39 @@ export default {
     }
   },
   created() {
-    this.load()
+    this.init()
     //备份model原始值
     this.modelDefault = JSON.parse(JSON.stringify(this.model))
   },
   methods: {
-    load() {
-      const select = {}
-      getAction('/baogao/itdmBaogao//weituo/list', select).then((res) => {
+
+    handlewcChange(data) {
+      var weituoClient = { weituoClient: data }
+
+      getAction('/weituo/itdmWeituoInfo/weituoNoList', weituoClient).then((res) => {
         if (res.success) {
           this.weituoDictOptions = res.result.map(i => {
-            const map = {}
-            map.text = i.weituoNo
-            map.value = i.id
-            return map
-          })
-          console.log(this.weituoDictOptions)
+            return { value: i.id, text: i.weituoNo }
 
-        } else {
-          this.$message.warning(res.message)
+          })
         }
       })
+
     },
 
+    init() {
 
+      getAction('/weituo/itdmWeituoInfo/distinctClientList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.weituoClientList = res.result.map(i => {
+            return { value: i, text: i }
+          })
+          console.log(this.weituoClientList)
+        }
+      })
 
+    },
 
     yangpmList(weituoId) {
       const select = { weituoId: weituoId }
@@ -193,7 +209,6 @@ export default {
             map.value = i.id
             return map
           })
-          console.log(this.weituoDictOptions)
 
         } else {
           this.$message.warning(res.message)
@@ -201,7 +216,6 @@ export default {
       })
     },
 
-
     queryShiyanList(yangpinIds) {
       const select = { 'yangpinIds': yangpinIds.toString() }
       getAction('/baogao/itdmBaogao/shiyan/list', select).then((res) => {
@@ -213,14 +227,13 @@ export default {
             return map
           })
 
-
         } else {
           this.$message.warning(res.message)
         }
       })
     },
 
-    handleYPChange(value){
+    handleYPChange(value) {
       console.log(value)
       this.queryShiyanList(value)
     },

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

@@ -5,41 +5,27 @@
       <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="委托单位名称">
+              <j-search-select-tag placeholder="请选择委托单位名称" :dictOptions="weituoClientList"  @change="handlewcChange" />
             </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.shijiShebeiId"></a-input>
+            <a-form-item label="委托编号">
+              <j-search-select-tag placeholder="请选择委托编号" :dictOptions="weituoNoList"  @change="handlewnChange" />
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="实绩试验类型">
-                <j-dict-select-tag placeholder="请选择实绩试验类型" v-model="queryParam.shijiShiiyanType" dictCode="shiyan_type"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="10" :lg="11" :md="12" :sm="24">
-              <a-form-item label="任务日期">
-                <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.workDate_begin"></j-date>
-                <span class="query-group-split-cust"></span>
-                <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.workDate_end"></j-date>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="10" :lg="11" :md="12" :sm="24">
-              <a-form-item label="实绩任务日期">
-                <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_begin"></j-date>
-                <span class="query-group-split-cust"></span>
-                <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_end"></j-date>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="状态">
-                <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="test_plan_status"/>
-              </a-form-item>
-            </a-col>
-          </template>
+
+
+          <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"   />
+            </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>
@@ -79,7 +65,8 @@
         </template>
         <template slot="imgSlot" slot-scope="text,record">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
+               style="max-width:80px;font-size: 12px;font-style: italic;" />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -94,7 +81,7 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record" >
+        <span slot="action" slot-scope="text, record">
 
           <a @click="handleEdit(record)">确认</a>
 
@@ -110,151 +97,210 @@
 
 <script>
 
-  import '@assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ItdmGongdanDetailModal from './modules/ItdmGongdanDetailModal'
-  import {filterMultiDictText} from '@comp/dict/JDictSelectUtil'
-
-  export default {
-    name: 'ItdmGongdanDetailList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ItdmGongdanDetailModal
-    },
-    data () {
-      return {
-        description: '工单detail管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'工单id',
-            align:"center",
-            dataIndex: 'woId'
-          },
-          {
-            title:'实绩设备id',
-            align:"center",
-            dataIndex: 'shijiShebeiId_dictText'
-          },
-          {
-            title:'传感器',
-            align:"center",
-            dataIndex: 'chuanganqi_dictText'
-          },
-          {
-            title:'实绩试验类型',
-            align:"center",
-            dataIndex: 'shijiShiiyanType_dictText'
-          },
-          {
-            title:'任务日期',
-            align:"center",
-            dataIndex: 'workDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'试验开始时间',
-            align:"center",
-            dataIndex: 'startTime'
-          },
-          {
-            title:'试验结束时间',
-            align:"center",
-            dataIndex: 'endTime'
-          },
-          {
-            title:'实绩任务日期',
-            align:"center",
-            dataIndex: 'shijiWorkDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'实绩试验开始时间',
-            align:"center",
-            dataIndex: 'shijiStartTime'
-          },
-          {
-            title:'实绩试验结束时间',
-            align:"center",
-            dataIndex: 'shijiEndTime'
-          },
-          // {
-          //   title:'状态',
-          //   align:"center",
-          //   dataIndex: 'status_dictText'
-          // },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/gongdandetail/itdmGongdanDetail/list",
-          delete: "/gongdandetail/itdmGongdanDetail/delete",
-          deleteBatch: "/gongdandetail/itdmGongdanDetail/deleteBatch",
-          exportXlsUrl: "/gongdandetail/itdmGongdanDetail/exportXls",
-          importExcelUrl: "gongdandetail/itdmGongdanDetail/importExcel",
+import '@assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import ItdmGongdanDetailModal from './modules/ItdmGongdanDetailModal'
+import { filterMultiDictText } from '@comp/dict/JDictSelectUtil'
+import { getAction } from '@api/manage'
+
+export default {
+  name: 'ItdmGongdanDetailList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ItdmGongdanDetailModal
+  },
+  data() {
+    return {
+      weituoClientList:[],
+      weituoNoList:[],
+      gongdanList:[],
 
+
+      description: '工单detail管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '工单id',
+          align: 'center',
+          dataIndex: 'woId'
+        },
+        {
+          title: '实绩设备id',
+          align: 'center',
+          dataIndex: 'shijiShebeiId_dictText'
+        },
+        {
+          title: '传感器',
+          align: 'center',
+          dataIndex: 'chuanganqi_dictText'
+        },
+        {
+          title: '实绩试验类型',
+          align: 'center',
+          dataIndex: 'shijiShiiyanType_dictText'
+        },
+        {
+          title: '任务日期',
+          align: 'center',
+          dataIndex: 'workDate',
+          customRender: function(text) {
+            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
+          }
+        },
+        {
+          title: '试验开始时间',
+          align: 'center',
+          dataIndex: 'startTime'
+        },
+        {
+          title: '试验结束时间',
+          align: 'center',
+          dataIndex: 'endTime'
+        },
+        {
+          title: '实绩任务日期',
+          align: 'center',
+          dataIndex: 'shijiWorkDate',
+          customRender: function(text) {
+            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
+          }
         },
-        dictOptions:{},
-        superFieldList:[],
-      }
+        {
+          title: '实绩试验开始时间',
+          align: 'center',
+          dataIndex: 'shijiStartTime'
+        },
+        {
+          title: '实绩试验结束时间',
+          align: 'center',
+          dataIndex: 'shijiEndTime'
+        },
+        // {
+        //   title:'状态',
+        //   align:"center",
+        //   dataIndex: 'status_dictText'
+        // },
+        {
+          title: '备注',
+          align: 'center',
+          dataIndex: 'remark'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: '/gongdandetail/itdmGongdanDetail/list',
+        delete: '/gongdandetail/itdmGongdanDetail/delete',
+        deleteBatch: '/gongdandetail/itdmGongdanDetail/deleteBatch',
+        exportXlsUrl: '/gongdandetail/itdmGongdanDetail/exportXls',
+        importExcelUrl: 'gongdandetail/itdmGongdanDetail/importExcel'
+
+      },
+      dictOptions: {},
+      superFieldList: []
+    }
+  },
+  created() {
+    this.getSuperFieldList()
+    this.init()
+  },
+  computed: {
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  methods: {
+    init(){
+
+      getAction('/weituo/itdmWeituoInfo/distinctClientList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.weituoClientList = res.result.map(i=>{
+            return { value: i, text: i}
+          })
+          console.log(this.weituoClientList)
+        }
+      })
+
+
     },
-    created() {
-    this.getSuperFieldList();
+
+    handlewcChange(data){
+
+      var weituoClient={weituoClient:data}
+      getAction('/weituo/itdmWeituoInfo/weituoNoList', weituoClient).then((res) => {
+        if (res.success) {
+          console.log("xxxxxxxxxxxxxxxxxxx")
+          console.log(res.result)
+          this.weituoNoList = res.result.map(i=>{
+            return { value: i.id, text: i.weituoNo}
+          })
+          console.log(this.weituoNoList)
+        }
+      })
+
+
+
+
+      console.log(data)
     },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+
+    handlewnChange(data){
+
+      var weituoClient={weituoId:data}
+      getAction('/gongdandetail/itdmGongdanDetail/gongdanIdList', weituoClient).then((res) => {
+        if (res.success) {
+          console.log("xxxxxxxxxxxxxxxxxxx")
+          console.log(res.result)
+          this.gongdanList = res.result.map(i=>{
+            return { value: i, text: i}
+          })
+          console.log(this.gongdanList)
+        }
+      })
+
+
+
     },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'woId',text:'工单id',dictCode:''})
-        fieldList.push({type:'string',value:'shijiShebeiId_dictText',text:'实绩设备id'})
-        fieldList.push({type:'string',value:'chuanganqi_dictText',text:'传感器'})
-
-        fieldList.push({type:'int',value:'shijiShiiyanType_dictText',text:'实绩试验类型',dictCode:'shiyan_type'})
-        fieldList.push({type:'date',value:'workDate',text:'任务日期'})
-        fieldList.push({type:'string',value:'startTime',text:'试验开始时间',dictCode:''})
-        fieldList.push({type:'string',value:'endTime',text:'试验结束时间',dictCode:''})
-        fieldList.push({type:'date',value:'shijiWorkDate',text:'实绩任务日期'})
-        fieldList.push({type:'string',value:'shijiStartTime',text:'实绩试验开始时间',dictCode:''})
-        fieldList.push({type:'string',value:'shijiEndTime',text:'实绩试验结束时间',dictCode:''})
-        // fieldList.push({type:'int',value:'status',text:'状态',dictCode:'test_plan_status'})
-        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
-        this.superFieldList = fieldList
-      }
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'woId', text: '工单id', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'shijiShebeiId_dictText', text: '实绩设备id' })
+      fieldList.push({ type: 'string', value: 'chuanganqi_dictText', text: '传感器' })
+
+      fieldList.push({ type: 'int', value: 'shijiShiiyanType_dictText', text: '实绩试验类型', dictCode: 'shiyan_type' })
+      fieldList.push({ type: 'date', value: 'workDate', text: '任务日期' })
+      fieldList.push({ type: 'string', value: 'startTime', text: '试验开始时间', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'endTime', text: '试验结束时间', dictCode: '' })
+      fieldList.push({ type: 'date', value: 'shijiWorkDate', text: '实绩任务日期' })
+      fieldList.push({ type: 'string', value: 'shijiStartTime', text: '实绩试验开始时间', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'shijiEndTime', text: '实绩试验结束时间', dictCode: '' })
+      // fieldList.push({type:'int',value:'status',text:'状态',dictCode:'test_plan_status'})
+      fieldList.push({ type: 'string', value: 'remark', text: '备注', dictCode: '' })
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>