设备点检优化

src/views/module_cmms/spotcheck/SpotcheckList.vue

@@ -161,12 +161,12 @@
             }
           },
           {
-            title:'所属点检内容编号',
+            title:'点检内容编号',
             align:"center",
             dataIndex: 'contentcode'
           },
           {
-            title:'所属点检内容名称',
+            title:'点检内容名称',
             align:"center",
             dataIndex: 'contentname'
           },
@@ -175,20 +175,25 @@
             align:"center",
             dataIndex: 'equipmentid_dictText'
           },
+          // {
+          //   title:'所属点检内容ID',
+          //   align:"center",
+          //   dataIndex: 'spotcheckcontid_dictText'
+          // },
           {
-            title:'所属点检内容ID',
+            title:'点检结果',
             align:"center",
-            dataIndex: 'spotcheckcontid_dictText'
+            dataIndex: 'result_dictText'
           },
           {
-            title:'点检时间',
+            title:'点检人',
             align:"center",
-            dataIndex: 'spotcheckdate'
+            dataIndex: 'createBy'
           },
           {
-            title:'点检结果',
+            title:'点检时间',
             align:"center",
-            dataIndex: 'result_dictText'
+            dataIndex: 'spotcheckdate'
           },
           {
             title:'点检描述',

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -46,6 +46,10 @@
               <a-textarea v-model="model.remark" placeholder="请输入点检备注" :auto-size="{ minRows: 2, maxRows: 3 }" />
             </a-form-model-item>
           </a-col>
+          <!-- <a-col :span="12">
+            <a-form-model-item label="点检人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createBy">
+            </a-form-model-item>
+          </a-col> -->
           <a-col :span="12">
             <a-form-model-item label="故障照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
               <j-image-upload text="上传" v-model="model.files" isMultiple></j-image-upload>
@@ -204,12 +208,18 @@
     methods: {
       add () {
         this.edit(this.modelDefault);
-        this.model.id = ""
         this.disableds = true
         // 第二版
         // this.model = this.dataList
         // this.model.id = ""
       },
+      handleChange(value){
+        console.log(value)
+        getAction(`/cmmsSpotcheck/cmmsSpotcheck/getInfoByEquipmentid/${value}`).then((res) => {
+          this.model = res.result
+          this.model.id = ""
+        })
+      },
       edit (record) {
         this.disableds = true
         getAction(`/cmmsSpotcheck/cmmsSpotcheck/getInfoBySpotcheckid/${record.id}`).then((res) => {
@@ -258,12 +268,6 @@
           }
         })
       },
-      handleChange(value){
-        console.log(value)
-        getAction(`/cmmsSpotcheck/cmmsSpotcheck/getInfoByEquipmentid/${value}`).then((res) => {
-          this.model = res.result
-        })
-      },
       allT() {
         this.model.cmmsSpotcheckTitemList = this.model.cmmsSpotcheckTitemList.map((res) => {
           var data = res