32197351@qq.com 2 роки тому
батько
коміт
5872fe2f3c

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

@@ -241,7 +241,7 @@
         fieldList.push({type:'string',value:'shijiShebeiId_dictText',text:'实绩设备id'})
         fieldList.push({type:'string',value:'chuanganqi_dictText',text:'传感器'})
 
-        fieldList.push({type:'int',value:'shijiShiiyanType',text:'实绩试验类型',dictCode:'shiyan_type'})
+        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:''})

+ 13 - 0
itdmWeb/src/views/module-iTDM/gongdandetail/modules/ItdmGongdanDetailForm.vue

@@ -20,6 +20,19 @@
               <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="shijiShiiyanType">
+              <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">
             <a-form-model-item label="实绩任务日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiWorkDate">
               <j-date placeholder="请选择实绩任务日期" v-model="model.shijiWorkDate" style="width: 100%" />