Merge remote-tracking branch 'origin/master'

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

@@ -423,11 +423,17 @@ export default {
           width: '200px'
         },
         {
-          title: '问题描述',
+          title: '故障现象',
           dataIndex: 'problemDesc',
           ellipsis: true,
           width: '200px'
         },
+        {
+          title: '检查处理过程',
+          dataIndex: 'checkProcess',
+          ellipsis: true,
+          width: '200px'
+        },
         {
           title: '原因分析',
           dataIndex: 'reasonAnalysis',

src/views/repair/repair-reason/RepairReason.vue

@@ -102,11 +102,17 @@ export default {
           width: '200px'
         },
         {
-          title: '问题描述',
+          title: '故障现象',
           dataIndex: 'problemDesc',
           ellipsis: true,
           width: '200px'
         },
+        {
+          title: '检查处理过程',
+          dataIndex: 'checkProcess',
+          ellipsis: true,
+          width: '200px'
+        },
         {
           title: '原因分析',
           dataIndex: 'reasonAnalysis',

src/views/repair/repair-reason/modules/BaseForm.vue

@@ -4,14 +4,15 @@
       <a-col :md="48" :sm="48">
         <span class="table-page-search-submitButtons" style="float: right" >
           <a-button v-show="currentTab!== 0" style="margin-left: 8px" @click="prev()">上一步</a-button>
-          <a-button style="margin-left: 8px" v-show="currentTab!== 2" type="primary" @click="next()">下一步</a-button>
+          <a-button style="margin-left: 8px" v-show="currentTab!== 3" type="primary" @click="next()">下一步</a-button>
           <a-button style="margin-left: 8px" type="primary" @click="save()">保存</a-button>
           <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
         </span>
       </a-col>
     </a-row>
     <a-steps :current="currentTab" >
-      <a-step title="问题描述" />
+      <a-step title="故障现象" />
+      <a-step title="检查处理过程" />
       <a-step title="原因分析" />
       <a-step title="改进措施" />
     </a-steps>
@@ -35,20 +36,27 @@
           </a-form-model-item>
         </row-item>
         <row-item v-show="currentTab=== 0">
-          <a-form-model-item required label="问题描述" prop="problemDesc">
+          <a-form-model-item required label="故障现象" prop="problemDesc">
             <a-textarea
               :auto-size="{ minRows: 30 }"
               v-model="model.problemDesc"/>
           </a-form-model-item>
         </row-item>
         <row-item v-show="currentTab=== 1">
+          <a-form-model-item required label="检查处理过程" prop="problemDesc">
+            <a-textarea
+              :auto-size="{ minRows: 30 }"
+              v-model="model.checkProcess"/>
+          </a-form-model-item>
+        </row-item>
+        <row-item v-show="currentTab=== 2">
           <a-form-model-item label="原因分析" prop="reasonAnalysis">
             <a-textarea
               :auto-size="{ minRows: 30 }"
               v-model="model.reasonAnalysis"/>
           </a-form-model-item>
         </row-item>
-        <row-item v-show="currentTab=== 2">
+        <row-item v-show="currentTab=== 3">
           <a-form-model-item label="改进措施" prop="reasonAnalysis">
             <a-textarea
               :auto-size="{ minRows: 30 }"
@@ -76,6 +84,7 @@ export default {
         no: '',
         analyzeTime: null,
         problemDesc: '',
+        checkProcess: '',
         reasonAnalysis: '',
         improveMeasure: ''
       },
@@ -90,13 +99,16 @@ export default {
           { required: true, message: '请输入分析时间', trigger: 'blur' }
         ],
         problemDesc: [
-          { required: true, message: '请输入', trigger: 'blur' }
+          { required: true, message: '请输入故障现象', trigger: 'blur' }
+        ],
+        checkProcess: [
+          { required: true, message: '请输入检查处理过程', trigger: 'blur' }
         ],
         reasonAnalysis: [
-          { message: '请输入', trigger: 'blur' }
+          { message: '请输入原因分析', trigger: 'blur' }
         ],
         improveMeasure: [
-          { message: '请输入', trigger: 'blur' }
+          { message: '请输入改进措施', trigger: 'blur' }
         ]
       }
       // 下拉框map

src/views/repair/repair-reason/modules/Detail.vue

@@ -17,10 +17,16 @@
 
     <a-row>
       <a-col style="margin-top: 10px">
-        <div class="term">问题描述:</div>
+        <div class="term">故障现象:</div>
         <div class="content">{{ model.problemDesc }}</div>
       </a-col>
     </a-row>
+    <a-row>
+      <a-col style="margin-top: 10px">
+        <div class="term">检查处理过程:</div>
+        <div class="content">{{ model.checkProcess }}</div>
+      </a-col>
+    </a-row>
     <a-row>
       <a-col style="margin-top: 10px">
         <div class="term">原因分析:</div>
@@ -62,6 +68,7 @@ export default {
         'repairId': null,
         'analyzeTime': null,
         'problemDesc': null,
+        'checkProcess': null,
         'reasonAnalysis': null,
         'improveMeasure': null
       }