检定完善

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

@@ -141,7 +141,7 @@
         <spare-pick-form-select-table :type="1" :table-params="{repairId: model.id, repairNo: model.no}" ref="sparePickFormSelectTable"/>
       </q-tab-pane>
     </q-tabs>-->
-      <title-divider title="原因分析" width="90px"></title-divider>
+      <title-divider title="维修报告" width="90px"></title-divider>
       <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
       <!--        <a-button type="primary" @click="handleAddReason">-->
       <!--          <a-icon type="plus"/>-->
@@ -363,7 +363,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

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

@@ -78,76 +78,51 @@
           </div>
         </a-layout-sider>
       </a-layout>
-      <!--    <title-divider title="维修项目" width="90px"></title-divider>-->
-      <!--    <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
-      <!--      <a-button type="primary" @click="handleRepairProjectSelect">-->
-      <!--        <a-icon type="plus"/>-->
-      <!--        添加-->
-      <!--      </a-button>-->
-      <!--    </div>-->
-      <!--    <a-table-->
-      <!--      :data-source="data"-->
-      <!--      :columns="columns"-->
-      <!--      tableLayout="auto"-->
-      <!--      rowKey="id">-->
-      <!--    </a-table>-->
       <title-divider title="配件清单" width="90px"></title-divider>
-      <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
-      <!--        <a-button type="primary" @click="handleSpareSelect">-->
-      <!--          <a-icon type="plus"/>-->
-      <!--          添加-->
-      <!--        </a-button>-->
-      <!--      </div>-->
+      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">
+        <a-button type="primary" @click="handleSpareSelect">
+          <a-icon type="plus"/>
+          添加
+        </a-button>
+      </div>
       <a-table
         :data-source="dataSpare"
         :columns="columnsSpare"
         tableLayout="auto"
         rowKey="id">
-
       </a-table>
-
       <title-divider title="费用清单" width="90px"></title-divider>
-      <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
-      <!--        <a-button type="primary" @click="handleAddFee">-->
-      <!--          <a-icon type="plus"/>-->
-      <!--          添加-->
-      <!--        </a-button>-->
-      <!--      </div>-->
+      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">
+        <a-button type="primary" @click="handleAddFee">
+          <a-icon type="plus"/>
+          添加
+        </a-button>
+      </div>
       <a-table
         :data-source="dataFee"
         :columns="columnsFee"
         tableLayout="auto"
         rowKey="id">
-        <!--        <span slot="action" slot-scope="record">-->
-        <!--          <template>-->
-        <!--            <a @click="handleViewFee(record)">查看</a>-->
-        <!--            <operation-button-->
-        <!--              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"-->
-        <!--              @click="handleEditFee(record)" >修改</operation-button>-->
-
-        <!--            <operation-button-->
-        <!--              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"-->
-        <!--              :type="2"-->
-        <!--              title="确认删除该笔费用？"-->
-        <!--              @confirm="batchDeleteFee(record.id)" >删除</operation-button>-->
-        <!--          </template>-->
-        <!--        </span>-->
+        <span slot="action" slot-scope="record">
+          <template>
+            <a @click="handleViewFee(record)">查看</a>
+            <operation-button
+              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              @click="handleEditFee(record)" >修改</operation-button>
+            <operation-button
+              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              :type="2"
+              title="确认删除该笔费用？"
+              @confirm="batchDeleteFee(record.id)" >删除</operation-button>
+          </template>
+        </span>
       </a-table>
-      <!--<q-tabs :activeKey="activeKey" @change="changeTab">
-      <q-tab-pane key="a" tab="配件更换">
-        <spare-part-used-select-table :type="1" :table-params="{sbId: model.sbId, modelId: model.modelId, repairId: model.id}" ref="sparePartUsedSelectTable"/>
-      </q-tab-pane>
-      <q-tab-pane key="b" tab="备件领用">
-        <spare-pick-form-select-table :type="1" :table-params="{repairId: model.id, repairNo: model.no}" ref="sparePickFormSelectTable"/>
-      </q-tab-pane>
-    </q-tabs>-->
-      <title-divider title="原因分析" width="90px"></title-divider>
-      <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
-      <!--        <a-button type="primary" @click="handleAddReason">-->
-      <!--          <a-icon type="plus"/>-->
-      <!--          添加-->
-      <!--        </a-button>-->
-      <!--      </div>-->
+      <title-divider title="维修报告" width="90px"></title-divider>
+      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
+        <a-button type="primary" @click="handleAddReason">-->
+          <a-icon type="plus"/>
+        </a-button>-
+      </div>
       <a-table
         :data-source="dataReason"
         :columns="columnsReason"
@@ -156,19 +131,17 @@
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleViewReason(record)">查看</a>
-            <!--            <operation-button-->
-            <!--              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"-->
-            <!--              @click="handleEditReason(record)" >修改</operation-button>-->
-
-            <!--            <operation-button-->
-            <!--              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"-->
-            <!--              :type="2"-->
-            <!--              title="确认删除该记录？"-->
-            <!--              @confirm="batchDeleteReason(record.id)" >删除</operation-button>-->
+            <operation-button
+              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              @click="handleEditReason(record)" >修改</operation-button>
+            <operation-button
+              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              :type="2"
+              title="确认删除该记录？"
+              @confirm="batchDeleteReason(record.id)" >删除</operation-button>
           </template>
         </span>
       </a-table>
-
     </a-card>
     <check-form ref="checkForm" @ok="handleOk" />
     <fee-base-form ref="feeForm" @ok="handleOk" />
@@ -363,7 +336,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

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

@@ -141,7 +141,7 @@
         <spare-pick-form-select-table :type="1" :table-params="{repairId: model.id, repairNo: model.no}" ref="sparePickFormSelectTable"/>
       </q-tab-pane>
     </q-tabs>-->
-      <title-divider title="原因分析" width="90px"></title-divider>
+      <title-divider title="维修报告" width="90px"></title-divider>
       <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
       <!--        <a-button type="primary" @click="handleAddReason">-->
       <!--          <a-icon type="plus"/>-->
@@ -363,7 +363,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

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

@@ -138,7 +138,7 @@
       <!--          </template>-->
       <!--        </span>-->
       <!--      </a-table>-->
-      <title-divider title="原因分析" width="90px"></title-divider>
+      <title-divider title="维修报告" width="90px"></title-divider>
       <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">
         <a-button type="primary" @click="handleAddReason">
           <a-icon type="plus"/>
@@ -404,7 +404,7 @@ export default {
           width: '150px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '150px'

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

@@ -72,7 +72,7 @@
           </template>
         </span>
       </a-table>
-<!--      <title-divider title="原因分析" width="90px"></title-divider>-->
+<!--      <title-divider title="维修报告" width="90px"></title-divider>-->
 <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">-->
 <!--        <a-button type="primary" @click="handleAddReason">-->
 <!--          <a-icon type="plus"/>-->
@@ -343,7 +343,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

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

@@ -231,7 +231,7 @@ export default {
         // 日期处理
         values.repairFileList = this.repairFileList
         finish(values).then(() => {
-          this.$message.info('维修完成，请完成后续原因分析，完成后提交审核；')
+          this.$message.info('维修完成，请完成后续维修报告，完成后提交审核；')
           this.handleCancel(values)
         }).catch(() => {
           this.confirmLoading = false

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

@@ -114,7 +114,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

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

@@ -74,10 +74,10 @@
           <a-form-item
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
-            label="原因分析">
+            label="维修报告">
             <a-textarea
               :auto-size="{ minRows: 5 }"
-              v-decorator="['reasonAnalysis', {rules: [{required: true, message: '原因分析不能为空'}]}]" />
+              v-decorator="['reasonAnalysis', {rules: [{required: true, message: '维修报告不能为空'}]}]" />
           </a-form-item>
         </a-col>
       </a-row>

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

@@ -13,7 +13,7 @@
     <a-steps :current="currentTab" >
       <a-step title="故障现象" />
       <a-step title="检查处理过程" />
-      <a-step title="原因分析" />
+      <a-step title="维修报告" />
       <a-step title="改进措施" />
     </a-steps>
     <a-form-model ref="form" :model="model" :rules="rules">
@@ -50,7 +50,7 @@
           </a-form-model-item>
         </row-item>
         <row-item v-show="currentTab=== 2">
-          <a-form-model-item label="原因分析" prop="reasonAnalysis">
+          <a-form-model-item label="维修报告" prop="reasonAnalysis">
             <a-textarea
               :auto-size="{ minRows: 5 }"
               v-model="model.reasonAnalysis"/>
@@ -105,7 +105,7 @@ export default {
           { required: true, message: '请输入检查处理过程', trigger: 'blur' }
         ],
         reasonAnalysis: [
-          { message: '请输入原因分析', trigger: 'blur' }
+          { message: '请输入维修报告', trigger: 'blur' }
         ],
         improveMeasure: [
           { message: '请输入改进措施', trigger: 'blur' }

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

@@ -26,7 +26,7 @@
     </a-row>
     <a-row>
       <a-col style="margin-top: 10px">
-        <div class="term">原因分析:</div>
+        <div class="term">维修报告:</div>
         <div class="content">{{ model.reasonAnalysis }}</div>
       </a-col>
     </a-row>

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

@@ -14,7 +14,7 @@
       <detail-list-item term="型号">{{ model.model }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.name }}</detail-list-item>
     </detail-list>
-    <title-divider title="历史故障原因分析" width="180px"></title-divider>
+    <title-divider title="历史故障维修报告" width="180px"></title-divider>
     <div class="table-operator" style="margin-bottom:8px;">
     </div>
     <a-table
@@ -106,7 +106,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'
@@ -134,7 +134,7 @@ export default {
     base (record) {
       this.visible = true
       this.model = record
-      this.modalTitle = '历史故障原因分析'
+      this.modalTitle = '历史故障维修报告'
       queryRepairReason({ sbId: record.id }).then(res => {
         this.data = res.data
       })