Parcourir la source

拆解工单——传感器、实绩试验类型改为多选

liuwj il y a 2 ans
Parent
commit
d1843cdf67

+ 4 - 3
itdmWeb/src/views/module-iTDM/itdmGongdanDetail/ItdmGongdanDetailList.vue

@@ -176,7 +176,7 @@ export default {
         {
           title:'实绩试验类型',
           align:"center",
-          dataIndex: 'shijiShiiyanType'
+          dataIndex: 'shijiShiiyanType_dictText'
         },
         {
           title:'任务日期',
@@ -222,7 +222,8 @@ export default {
         {
           title:'传感器',
           align:"center",
-          dataIndex: 'chuanganqi'
+          dataIndex: 'chuanganqi_dictText'
+          // dataIndex: 'chuanganqi'
         },
         {
           title: '操作',
@@ -258,9 +259,9 @@ export default {
     },
     getSuperFieldList(){
       let fieldList=[];
+      fieldList.push({type:'int',value:'shijiShiiyanType_dictText',text:'实绩试验类型',dictCode:'shiyan_type'})
       fieldList.push({type:'string',value:'woId',text:'工单id',dictCode:''})
       fieldList.push({type:'sel_search',value:'shijiShebeiId',text:'实绩设备id',dictTable:"itdm_device", dictText:'device_name', dictCode:'id'})
-      fieldList.push({type:'string',value:'shijiShiiyanType',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:''})

+ 8 - 2
itdmWeb/src/views/module-iTDM/itdmGongdanDetail/modules/ItdmGongdanDetailForm.vue

@@ -15,7 +15,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="实绩试验类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShiiyanType">
-              <a-input v-model="model.shijiShiiyanType" placeholder="请输入实绩试验类型"  ></a-input>
+<!--              <a-input v-model="model.shijiShiiyanType" placeholder="请输入实绩试验类型"  ></a-input>-->
+              <j-multi-select-tag type="list_multi" v-model="model.shijiShiiyanType" dictCode="shiiyan_type" placeholder="请选择实绩试验类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -55,9 +56,14 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="传感器" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chuanganqi">
-              <a-input v-model="model.chuanganqi" placeholder="请输入传感器"  ></a-input>
+              <j-multi-select-tag type="list_multi" v-model="model.chuanganqi" dictCode="itdm_chuanganqi,xuliehao,id" placeholder="请选择传感器" />
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="传感器" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chuanganqi">-->
+<!--              <a-input v-model="model.chuanganqi" placeholder="请输入传感器"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>