巡检路线

src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -137,11 +137,6 @@
             }
           },
           {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
             title:'巡检路线编号',
             align:"center",
             dataIndex: 'linecode'
@@ -152,6 +147,11 @@
             dataIndex: 'linename'
           },
           {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",

src/views/module_cmms/inspectLine/modules/InspectLineForm.vue

@@ -11,12 +11,12 @@
           </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="巡检路线名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linename">
-              <a-input v-model="model.linename" placeholder="请输入巡检路线名称"  ></a-input>
+              <a-input v-model="model.linename" placeholder="请输入巡检路线名称" ></a-input>
             </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>
@@ -28,7 +28,7 @@
           size="middle"
           rowKey="id"
           :columns="spotColumns"
-          :dataSource="model.inspectSpotList"
+          :dataSource="model.detailList"
           :pagination="false"
           class="line-spot-table">
           <template slot="expandedRowRender" slot-scope="record">
@@ -59,7 +59,7 @@
           </template>
         </a-table>
       </a-form-model>
-      <inspect-line-modal-add ref="addSpotRef" :selectData="model.inspectSpotList" @ok="handleOk"></inspect-line-modal-add>
+      <inspect-line-modal-add ref="addSpotRef" :selectData="model.detailList" @ok="handleOk"></inspect-line-modal-add>
     </j-form-container>
   </a-spin>
 </template>
@@ -86,7 +86,7 @@
     data () {
       return {
         model:{
-          inspectSpotList: []
+          detailList: []
         },
         labelCol: {
           xs: { span: 24 },
@@ -285,7 +285,8 @@
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+        // this.edit(this.modelDefault);
+        this.visible = true;
       },
       addInspectSpot(){
         this.$refs.addSpotRef.add();
@@ -332,10 +333,10 @@
       },
       handleOk(data){
         console.log(data)
-        data.map(res=>{
-
+        this.model.detailList = data.map(item=>{
+          item.inspectspotid = item.id
+          return item
         })
-        this.model.inspectSpotList = data;
       },
     }
   }

src/views/module_cmms/inspectLine/modules/InspectLineModalAdd.vue

@@ -100,7 +100,7 @@
         this.selectionRows = this.selectData
         console.log(this.selectData)
         this.selectedRowKeys = this.selectData.map((res) => {
-          return res.id
+          return res.inspectspotid
         })
       },
       close () {
@@ -109,7 +109,7 @@
         this.onClearSelected()
         this.selectionRows = this.selectData
         this.selectedRowKeys = this.selectData.map((res) => {
-          return res.id
+          return res.inspectspotid
         })
         this.dataSource = []
       },

src/views/module_cmms/inspectSpot/modules/InspectSpotForm.vue

@@ -228,7 +228,7 @@
       },
       handleOk(data){
         data.map(res=>{
-
+          
         })
         this.model.inspectContentList = data;
       },