工单制定显示相关数据

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

@@ -164,21 +164,31 @@ export default {
           }
         },
         {
-          title:'工单id',
+          title:'检测项目',
           align:"center",
-          dataIndex: 'woId'
+          dataIndex: 'testItemsId_dictText'
         },
         {
-          title:'实绩设备',
+          title:'报告编号',
           align:"center",
-          dataIndex: 'shijiShebeiId_dictText'
+          dataIndex: 'jihuaShiyanId_dictText'
         },
         {
-          title:'实绩试验类型',
+          title:'委托样品',
           align:"center",
-          dataIndex: 'shijiShiiyanType_dictText'
+          dataIndex: 'weituoYangpinId_dictText'
         },
         {
+          title:'设备',
+          align:"center",
+          dataIndex: 'shebeiId_dictText'
+        },
+        // {
+        //   title:'工单id',
+        //   align:"center",
+        //   dataIndex: 'woId'
+        // },
+        {
           title:'任务日期',
           align:"center",
           dataIndex: 'workDate',
@@ -197,6 +207,16 @@ export default {
           dataIndex: 'endTime'
         },
         {
+          title:'实绩设备',
+          align:"center",
+          dataIndex: 'shijiShebeiId_dictText'
+        },
+        {
+          title:'实绩试验类型',
+          align:"center",
+          dataIndex: 'shijiShiiyanType_dictText'
+        },
+        {
           title:'实绩任务日期',
           align:"center",
           dataIndex: 'shijiWorkDate',
@@ -214,17 +234,17 @@ export default {
           align:"center",
           dataIndex: 'shijiEndTime'
         },
-        {
-          title:'备注',
-          align:"center",
-          dataIndex: 'remark'
-        },
+        // {
+        //   title:'备注',
+        //   align:"center",
+        //   dataIndex: 'remark'
+        // },
         {
           title:'传感器',
           align:"center",
           dataIndex: 'chuanganqi_dictText'
           // dataIndex: 'chuanganqi'
-        }
+        },
         // {
         //   title: '操作',
         //   dataIndex: 'action',

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

@@ -9,6 +9,11 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
+            <a-form-model-item label="报告编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jihuaShiyanId">
+              <j-search-select-tag v-model="model.jihuaShiyanId" dict="itdm_test_plan,report_no,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
             <a-form-model-item label="实绩设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShebeiId">
               <j-search-select-tag v-model="model.shijiShebeiId" dict="itdm_device,device_name,id"  />
             </a-form-model-item>