Merge remote-tracking branch 'origin/master'

src/views/module_cmms/upkeepItem/UpkeepItemList.vue

@@ -178,7 +178,7 @@
             dataIndex: 'itemcode'
           },
           {
-            title:'保养描述',
+            title:'保养标准',
             align:"center",
             dataIndex: 'itemcontent'
           },
@@ -224,7 +224,7 @@
         fieldList.push({type:'string',value:'itemcode',text:'保养编号',dictCode:''})
         fieldList.push({type:'string',value:'itemname',text:'名称',dictCode:''})
         fieldList.push({type:'string',value:'equipdefid',text:'设备类型ID（设备树，可单选可多选，多选设备类型用逗号连接）',dictCode:''})
-        fieldList.push({type:'string',value:'itemcontent',text:'保养描述',dictCode:''})
+        fieldList.push({type:'string',value:'itemcontent',text:'保养标准',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }

src/views/module_cmms/upkeepItem/modules/UpkeepItemForm.vue

@@ -30,8 +30,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="保养描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemcontent">
-              <a-input v-model="model.itemcontent" placeholder="请输入保养描述"  ></a-input>
+            <a-form-model-item label="保养标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemcontent">
+              <a-input v-model="model.itemcontent" placeholder="请输入保养标准"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">