Merge remote-tracking branch 'origin/master'

src/views/module_ems/cmmsSpotcheckItem/CmmsSpotcheckItemList.vue

@@ -185,6 +185,11 @@
             dataIndex: 'tag'
           },
           {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",
@@ -199,7 +204,7 @@
           deleteBatch: "/cmmsSpotcheckItem/cmmsSpotcheckItem/deleteBatch",
           exportXlsUrl: "/cmmsSpotcheckItem/cmmsSpotcheckItem/exportXls",
           importExcelUrl: "cmmsSpotcheckItem/cmmsSpotcheckItem/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -224,6 +229,7 @@
         fieldList.push({type:'string',value:'conditions',text:'标准',dictCode:''})
         fieldList.push({type:'string',value:'itemtype',text:'点检项分类',dictCode:'spotcheck_item_type'})
         fieldList.push({type:'string',value:'tag',text:'标签',dictCode:''})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }
     }

src/views/module_ems/cmmsSpotcheckItem/modules/CmmsSpotcheckItemForm.vue

@@ -33,6 +33,11 @@
               <a-input v-model="model.tag" 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-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -121,7 +126,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

src/views/module_ems/tpmTag/TpmTagList.vue

@@ -222,7 +222,7 @@ import TpmTagModalPL from './modulesPL/TpmTagModalPL.vue'
           deleteBatch: "/tpmTag/tpmTag/deleteBatch",
           exportXlsUrl: "/tpmTag/tpmTag/exportXls",
           importExcelUrl: "tpmTag/tpmTag/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],