完善

src/utils/dict.js

@@ -737,10 +737,8 @@ DictCache.VALUE = {
    * 报修来源
    */
   REPAIR_APPLICATION_FORM_SOURCE: {
-    CHECK: 1, // 点检
-    MAINTAIN: 2, // 保养
-    LUBRICATION: 3, // 润滑
-    SCENE: 4 // 现场
+    LUBRICATION: 2, // 维修人员
+    SCENE: 1 // 使用人员
   },
   /**
    * 是否

src/views/repair/application-form/modules/BaseForm.vue

@@ -11,29 +11,30 @@
 
       <a-form-item v-show="false" >
         <a-input v-decorator="['id']" type="hidden"/>
+        <a-input v-decorator="['sbId']" type="hidden"/>
       </a-form-item>
 
       <row-list :col="2">
         <row-item>
           <a-form-item
-            label="设备id"
+            label="设备名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
-            v-show="false"
           >
             <a-input
-              v-decorator="['sbId', {rules: [{required: true, message: '设备id不能为空'}]}]" />
+              style="width: 70%"
+              disabled
+              v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]" />
+            <a-button style="width: 30%" type="primary" @click="handleSbSelect">选择</a-button>
           </a-form-item>
           <a-form-item
-            label="设备名称"
+            label="使用位置"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              style="width: 70%"
               disabled
-              v-decorator="['sbName', {rules: [{required: true, message: '设备名称不能为空'}]}]" />
-            <a-button style="width: 30%" type="primary" @click="handleSbSelect">选择</a-button>
+              v-decorator="['cph']" />
           </a-form-item>
         </row-item>
         <!--<row-item>
@@ -107,7 +108,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['source', {initialValue: DictCache.VALUE.REPAIR_APPLICATION_FORM_SOURCE.CHECK,rules: [{required: true, message: '报修来源不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['source', {initialValue: DictCache.VALUE.REPAIR_APPLICATION_FORM_SOURCE.SCENE,rules: [{required: true, message: '报修来源不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in sourceMap"
                 :key="value"
@@ -124,10 +125,10 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['actualUser', {initialValue: userInfo.realName, rules: [{required: false, message: '报修人不能为空'}]}]"/>
+              v-decorator="['actualUser', {initialValue: userInfo.realName, rules: [{required: true, message: '报修人不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="紧急等级"
             :labelCol="BaseTool.Constant.labelCol"
@@ -160,7 +161,7 @@
             >
             </a-tree-select>
           </a-form-item>
-        </row-item>
+        </row-item>-->
         <row-item>
           <a-form-item
             label="报修图片"
@@ -200,7 +201,7 @@
           </a-form-item>
         </row-item>
 
-<!--        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="故障描述"
             :labelCol="BaseTool.Constant.labelCol2"
@@ -398,7 +399,8 @@ export default {
       this.$nextTick(() => {
         setFieldsValue(Object.assign({
           'sbId': key,
-          'sbName': row.name
+          'sbName': row.name,
+          'cph': row.cph
         }))
       })
     },

src/views/repair/application-form/modules/Detail.vue

@@ -16,6 +16,7 @@
           <detail-list title="" :col="3">
             <detail-list-item term="报修单号">{{ model.no }}</detail-list-item>
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
+            <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
             <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
             <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>

src/views/repair/application-form/modules/DetailCheck.vue

@@ -15,6 +15,7 @@
         <detail-list title="" :col="3">
           <detail-list-item term="报修单号">{{ model.no }}</detail-list-item>
           <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
+          <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
           <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
           <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
           <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>

src/views/repair/application-form/modules/DetailRepair.vue

@@ -25,7 +25,7 @@
           <detail-list title="" :col="3">
             <detail-list-item term="报修单号">{{ model.no }}</detail-list-item>
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-            <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
+            <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
             <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>

src/views/repair/application-form/modules/FinishForm.vue

@@ -29,7 +29,7 @@
             </a-select>
           </a-form-item>
         </row-item>
-        <row-item>
+<!--        <row-item>
           <a-form-item
             label="紧急等级"
             :labelCol="BaseTool.Constant.labelCol"
@@ -62,7 +62,7 @@
             >
             </a-tree-select>
           </a-form-item>
-        </row-item>
+        </row-item>-->
 
         <!--<row-item>
           <a-form-item

src/views/repair/application-form/modules/ImpBaseForm.vue

@@ -105,7 +105,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['source', {initialValue: DictCache.VALUE.REPAIR_APPLICATION_FORM_SOURCE.CHECK,rules: [{required: true, message: '报修来源不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['source', {initialValue: DictCache.VALUE.REPAIR_APPLICATION_FORM_SOURCE.SCENE,rules: [{required: true, message: '报修来源不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in sourceMap"
                 :key="value"