fix: 工单确认

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

@@ -145,7 +145,12 @@
           {
             title:'实绩设备id',
             align:"center",
-            dataIndex: 'shijiShebeiId'
+            dataIndex: 'shijiShebeiId_dictText'
+          },
+          {
+            title:'传感器',
+            align:"center",
+            dataIndex: 'chuanganqi_dictText'
           },
           {
             title:'实绩试验类型',
@@ -233,7 +238,9 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'woId',text:'工单id',dictCode:''})
-        fieldList.push({type:'string',value:'shijiShebeiId',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',text:'实绩试验类型',dictCode:'shiyan_type'})
         fieldList.push({type:'date',value:'workDate',text:'任务日期'})
         fieldList.push({type:'string',value:'startTime',text:'试验开始时间',dictCode:''})

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

@@ -3,30 +3,51 @@
     <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" prop="shijiShebeiId">
+
+              <j-search-select-tag
+                placeholder="请做出你的选择"
+                v-model="model.shijiShebeiId"
+                dict="itdm_device,device_name,id"
+                :async="true">
+              </j-search-select-tag>
 
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="传感器" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chuanganqi">
+              <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="shijiWorkDate">
-              <j-date placeholder="请选择实绩任务日期" v-model="model.shijiWorkDate"  style="width: 100%" />
+              <j-date placeholder="请选择实绩任务日期" v-model="model.shijiWorkDate" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiStartTime">
-              <j-date placeholder="请选择实绩试验开始时间" v-model="model.shijiStartTime" :showTime="true"  :dateFormat= "'HH:mm'" style="width: 100%" />
+            <a-form-model-item label="实绩试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                               prop="shijiStartTime">
+              <j-date placeholder="请选择实绩试验开始时间" v-model="model.shijiStartTime" :showTime="true"
+                      :dateFormat="'HH:mm'" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiEndTime">
-              <j-date placeholder="请选择实绩试验结束时间" v-model="model.shijiEndTime"  :showTime="true" :dateFormat="'HH:mm'" style="width: 100%" />
+            <a-form-model-item label="实绩试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                               prop="shijiEndTime">
+              <j-date placeholder="请选择实绩试验结束时间" v-model="model.shijiEndTime" :showTime="true"
+                      :dateFormat="'HH:mm'" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="test_plan_status"
+                                 placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
-<!--          <a-col :span="24">-->
-<!--            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">-->
-<!--              <j-dict-select-tag type="list" v-model="model.status" dictCode="test_plan_status" placeholder="请选择状态" />-->
-<!--            </a-form-model-item>-->
-<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+              <a-input v-model="model.remark" placeholder="请输入备注"></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -37,101 +58,99 @@
 
 <script>
 
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
+import { httpAction, getAction } from '@/api/manage'
+import { validateDuplicateValue } from '@/utils/util'
 
-  export default {
-    name: 'ItdmGongdanDetailForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           woId: [
-              { required: true, message: '请输入工单id!'},
-           ],
-           workDate: [
-              { required: true, message: '请输入任务日期!'},
-           ],
-           startTime: [
-              { required: true, message: '请输入试验开始时间!'},
-           ],
-           endTime: [
-              { required: true, message: '请输入试验结束时间!'},
-           ],
-        },
-        url: {
-          add: "/gongdandetail/itdmGongdanDetail/add",
-          edit: "/gongdandetail/itdmGongdanDetail/edit",
-          queryById: "/gongdandetail/itdmGongdanDetail/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
+export default {
+  name: 'ItdmGongdanDetailForm',
+  components: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
+  data() {
+    return {
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
       },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
       },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
+      confirmLoading: false,
+      validatorRules: {
+        woId: [
+          { required: true, message: '请输入工单id!' }
+        ],
+        workDate: [
+          { required: true, message: '请输入任务日期!' }
+        ],
+        startTime: [
+          { required: true, message: '请输入试验开始时间!' }
+        ],
+        endTime: [
+          { required: true, message: '请输入试验结束时间!' }
+        ]
       },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
+      url: {
+        add: '/gongdandetail/itdmGongdanDetail/add',
+        edit: '/gongdandetail/itdmGongdanDetail/edit',
+        queryById: '/gongdandetail/itdmGongdanDetail/queryById'
+      }
+    }
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled
+    }
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model))
+  },
+  methods: {
+    add() {
+      this.edit(this.modelDefault)
+    },
+    edit(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
+    submitForm() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit
+            method = 'put'
           }
+          httpAction(httpurl, this.model, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
 
-        })
-      },
+      })
     }
   }
+}
 </script>