xiongchao 3 years ago
parent
commit
035191000d
37 changed files with 154 additions and 143 deletions
  1. 1 1
      src/router/generator-platform-routers.js
  2. 2 2
      src/views/check/checkjob/CheckJob.vue
  3. 2 2
      src/views/check/checkjob/modules/BaseForm.vue
  4. 1 1
      src/views/check/checkjob/modules/CheckJobTable.vue
  5. 1 1
      src/views/check/checkjob/modules/CheckJobTableWaitDo.vue
  6. 2 2
      src/views/check/checkjob/modules/Detail.vue
  7. 1 1
      src/views/check/checkjob/modules/DetailSbCheckJob.vue
  8. 1 1
      src/views/check/checkstandard/CheckStandard.vue
  9. 5 5
      src/views/check/checkstandard/modules/BaseForm.vue
  10. 1 1
      src/views/check/checkstandard/modules/CheckStandardSelectModal.vue
  11. 1 1
      src/views/check/checkstandard/modules/Detail.vue
  12. 2 2
      src/views/check/checkstandard/modules/DetailSbCheck.vue
  13. 1 1
      src/views/check/checkstandard/modules/ImportFormAdd.vue
  14. 1 1
      src/views/repair/application-form/RepairApplicationForm.vue
  15. 3 2
      src/views/repair/application-form/RepairCheckForm.vue
  16. 1 1
      src/views/repair/application-form/RepairForm.vue
  17. 1 1
      src/views/repair/application-form/RepairOut.vue
  18. 2 2
      src/views/repair/application-form/modules/BaseForm.vue
  19. 4 4
      src/views/repair/application-form/modules/Detail.vue
  20. 7 8
      src/views/repair/application-form/modules/DetailCheck.vue
  21. 87 76
      src/views/repair/application-form/modules/DetailRepair.vue
  22. 2 2
      src/views/repair/application-form/modules/DetailRepairOut.vue
  23. 2 2
      src/views/repair/application-form/modules/FinishForm.vue
  24. 2 2
      src/views/repair/application-form/modules/ImpBaseForm.vue
  25. 1 1
      src/views/repair/application-form/modules/RepairApplicationFormTable.vue
  26. 1 1
      src/views/repair/form/modules/BaseForm.vue
  27. 1 1
      src/views/repair/form/modules/Detail.vue
  28. 3 3
      src/views/repair/repair-reason/modules/BaseForm.vue
  29. 3 3
      src/views/repair/repair-reason/modules/BaseFormBak.vue
  30. 1 1
      src/views/repair/repair-reason/modules/Detail.vue
  31. 2 2
      src/views/repair/repair-reason/modules/DetailRepairReason.vue
  32. 1 1
      src/views/repair/repair-reason/modules/RepairReasonTable.vue
  33. 1 1
      src/views/sb/info/SbInfoStandard.vue
  34. 2 2
      src/views/sb/info/modules/Detail.vue
  35. 2 2
      src/views/sb/info/modules/DetailBak.vue
  36. 2 2
      src/views/sb/modelbom/modules/BaseFormSb.vue
  37. 1 1
      src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModalSbInfo.vue

+ 1 - 1
src/router/generator-platform-routers.js

@@ -302,7 +302,7 @@ const constantRouterComponents = {
 
   // 设备报废
   'SbInfoScrap': () => import('@/views/sb/scrap/SbInfoScrap'),
-  // 设备保养标准
+  // 设备维护标准
   'SbInfoStandard': () => import('@/views/sb/info/SbInfoStandard'),
   // 导入
   'Imp': () => import('@/views/upms/impExcel/Imp'),

+ 2 - 2
src/views/check/checkjob/CheckJob.vue

@@ -41,7 +41,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="保养等级">
+              <a-form-item label="维护等级">
                 <a-select v-model="queryParam.standardLevel" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in standardLevelMap"
@@ -254,7 +254,7 @@ export default {
           width: '150px'
         },
         {
-          title: '保养等级',
+          title: '维护等级',
           dataIndex: 'standardlevel',
           width: '100px',
           checked: true,

+ 2 - 2
src/views/check/checkjob/modules/BaseForm.vue

@@ -145,12 +145,12 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="是否停机"
+            label="计划性维修"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-select
-              v-decorator="['sbStatus', {initialValue:1,rules: [{required: true, message: '是否停机不能为空'}]}]"
+              v-decorator="['sbStatus', {initialValue:1,rules: [{required: true, message: '计划性维修不能为空'}]}]"
               placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in sbStatusMap"

+ 1 - 1
src/views/check/checkjob/modules/CheckJobTable.vue

@@ -188,7 +188,7 @@ export default {
           width: '100px'
         },
         {
-          title: '保养等级',
+          title: '维护等级',
           dataIndex: 'standardlevel',
           width: '100px',
           checked: true,

+ 1 - 1
src/views/check/checkjob/modules/CheckJobTableWaitDo.vue

@@ -227,7 +227,7 @@ export default {
           scopedSlots: { customRender: 'status' }
         },
         //{
-        //  title: '是否停机',
+        //  title: '计划性维修',
         //  dataIndex: 'stopFlag',
         //  checked: true,
         //  scopedSlots: { customRender: 'stopFlag' }

+ 2 - 2
src/views/check/checkjob/modules/Detail.vue

@@ -23,7 +23,7 @@
       <detail-list-item term="编码">{{ modelStandard.no }}</detail-list-item>
       <detail-list-item term="检查类型">{{ BaseTool.Object.getField(typeMap,modelStandard.type) }}</detail-list-item>
       <detail-list-item term="计划周期">{{ modelStandard.period }}{{ BaseTool.Object.getField(periodTypeMap,modelStandard.periodType) }}</detail-list-item>
-      <detail-list-item term="保养等级">{{ BaseTool.Object.getField(periodTypeMap,modelStandard.level) }}</detail-list-item>
+      <detail-list-item term="维护等级">{{ BaseTool.Object.getField(periodTypeMap,modelStandard.level) }}</detail-list-item>
       <detail-list-item term="标准工时">{{ modelStandard.standardHours }}</detail-list-item>
       <detail-list-item term="动作类型">{{ BaseTool.Object.getField(actionTypeMap,modelStandard.actionType) }}</detail-list-item>
       <detail-list-item term="部位">{{ modelStandard.partName }}</detail-list-item>
@@ -63,7 +63,7 @@
       <detail-list-item term="截至日期">{{ model.endTime }}</detail-list-item>
       <detail-list-item term="实际开始时间">{{ model.actualStartTime }}</detail-list-item>
       <detail-list-item term="实际结束时间">{{ model.actualEndTime }}</detail-list-item>
-      <!--<detail-list-item term="是否停机"><badge :status="DictCache.COLOR.YES_NO[model.sbStatus]" :text="sbStatusMap[model.sbStatus]" /></detail-list-item>-->
+      <!--<detail-list-item term="计划性维修"><badge :status="DictCache.COLOR.YES_NO[model.sbStatus]" :text="sbStatusMap[model.sbStatus]" /></detail-list-item>-->
       <detail-list-item term="任务状态"><badge :status="DictCache.COLOR.CHECK_JOB_STATUS[model.status]" :text="statusMap[model.status]" /></detail-list-item>
     </detail-list>
     <detail-list title="" :col="1">

+ 1 - 1
src/views/check/checkjob/modules/DetailSbCheckJob.vue

@@ -159,7 +159,7 @@ export default {
           width: '100px'
         },
         {
-          title: '保养等级',
+          title: '维护等级',
           dataIndex: 'standardlevel',
           width: '100px',
           checked: true,

+ 1 - 1
src/views/check/checkstandard/CheckStandard.vue

@@ -180,7 +180,7 @@ export default {
           width: '200px'
         },
         {
-          title: '保养等级',
+          title: '维护等级',
           dataIndex: 'level',
           width: '100px',
           checked: true,

+ 5 - 5
src/views/check/checkstandard/modules/BaseForm.vue

@@ -51,7 +51,7 @@
         </row-item>-->
         <row-item>
           <a-form-item
-            label="检查部位"
+            label="维护部位"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -81,7 +81,7 @@
             </a-select>
           </a-form-item>
         </row-item>
-        <row-item v-show="checkUserType === 3">
+<!--        <row-item v-show="checkUserType === 3">
           <a-form-item
             label="指定执行人"
             :labelCol="BaseTool.Constant.labelCol"
@@ -96,15 +96,15 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </row-item>
+        </row-item>-->
         <row-item>
           <a-form-item
-            label="保养等级"
+            label="维护等级"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-select
-              v-decorator="['level', {rules: [{required: true, message: '保养等级不能为空'}]}]"
+              v-decorator="['level', {rules: [{required: true, message: '维护等级不能为空'}]}]"
               placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in levelMap"

+ 1 - 1
src/views/check/checkstandard/modules/CheckStandardSelectModal.vue

@@ -146,7 +146,7 @@ export default {
           width: '200px'
         },
         {
-          title: '保养等级',
+          title: '维护等级',
           dataIndex: 'level',
           width: '100px',
           checked: true,

+ 1 - 1
src/views/check/checkstandard/modules/Detail.vue

@@ -11,7 +11,7 @@
       <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
       <!--      <detail-list-item term="编码">{{ model.no }}</detail-list-item>-->
       <detail-list-item term="检查类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
-      <detail-list-item term="保养等级">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>
+      <detail-list-item term="维护等级">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>
       <detail-list-item term="计划周期">{{ model.period }}{{ BaseTool.Object.getField(periodTypeMap,model.periodType) }}</detail-list-item>
       <detail-list-item term="标准工时">{{ model.standardHours }}</detail-list-item>
       <detail-list-item term="上次实际日期">{{ model.lastDate }}</detail-list-item>

+ 2 - 2
src/views/check/checkstandard/modules/DetailSbCheck.vue

@@ -131,13 +131,13 @@ export default {
           }
         },
         {
-          title: '检查部位',
+          title: '维护部位',
           width: '100px',
           checked: true,
           dataIndex: 'partName'
         },
         {
-          title: '保养等级',
+          title: '维护等级',
           dataIndex: 'level',
           width: '100px',
           checked: true,

+ 1 - 1
src/views/check/checkstandard/modules/ImportFormAdd.vue

@@ -76,7 +76,7 @@ export default {
   methods: {
     base (type) {
       this.visible = true
-      this.modalTitle = '保养标准导入'
+      this.modalTitle = '维护标准导入'
       this.type = type
     },
     handleRemove (file) {

+ 1 - 1
src/views/repair/application-form/RepairApplicationForm.vue

@@ -223,7 +223,7 @@ export default {
           }
         },
         {
-          title: '是否停机',
+          title: '计划性维修',
           checked: true,
           dataIndex: 'needStop',
           customRender: (text, record, index) => {

+ 3 - 2
src/views/repair/application-form/RepairCheckForm.vue

@@ -79,6 +79,7 @@
         :columns="columns"
         :data="loadData"
         :alert="options.alert"
+        :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
         :rowSelection="options.rowSelection"
         showPagination="auto"
       >
@@ -133,7 +134,7 @@ export default {
     return {
       // 查询参数
       queryParam: {
-        filter: -1,
+        filter: 0,
         searchType: 3
       },
       visible: true,
@@ -200,7 +201,7 @@ export default {
           }
         },
         {
-          title: '是否停机',
+          title: '计划性维修',
           checked: true,
           dataIndex: 'needStop',
           customRender: (text, record, index) => {

+ 1 - 1
src/views/repair/application-form/RepairForm.vue

@@ -234,7 +234,7 @@ export default {
           }
         },
         {
-          title: '是否停机',
+          title: '计划性维修',
           checked: true,
           dataIndex: 'needStop',
           customRender: (text, record, index) => {

+ 1 - 1
src/views/repair/application-form/RepairOut.vue

@@ -158,7 +158,7 @@ export default {
         //   }
         // },
         // {
-        //   title: '是否停机',
+        //   title: '计划性维修',
         //   checked: true,
         //   dataIndex: 'needStop',
         //   customRender: (text, record, index) => {

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

@@ -40,11 +40,11 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="是否停机"
+            label="计划性维修"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="changeNeedStop" v-decorator="['needStop', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '是否停机不能为空'}]}]" placeholder="请选择">
+            <a-select @change="changeNeedStop" v-decorator="['needStop', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '计划性维修不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in needStopMap"
                 :key="value"

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

@@ -18,10 +18,10 @@
             <detail-list-item term="预留维修时间">{{ model.limitHours }}</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="计划性维修">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
             <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
-            <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
+<!--            <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>-->
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
             <detail-list-item term="报修状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]"/></detail-list-item>
             <detail-list-item term="要求时间">{{ model.limitHours }}小时</detail-list-item>
@@ -99,7 +99,7 @@
         </span>
       </a-table>
 
-      <title-divider title="原因分析" width="90px"></title-divider>
+      <title-divider title="维修报告" width="90px"></title-divider>
       <a-table
         :data-source="dataReason"
         :columns="columnsReason"
@@ -307,7 +307,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

+ 7 - 8
src/views/repair/application-form/modules/DetailCheck.vue

@@ -21,17 +21,16 @@
             <detail-list-item term="报修单号">{{ model.no }}</detail-list-item>
             <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-            <detail-list-item term="预留维修时间">{{ model.limitHours }}</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="计划性维修">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
             <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
-            <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
+<!--            <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>-->
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
             <detail-list-item term="报修状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]"/></detail-list-item>
-            <detail-list-item term="要求时间">{{ model.limitHours }}小时</detail-list-item>
-            <detail-list-item term="要求日期">{{ model.limitDate }}</detail-list-item>
+            <detail-list-item term="要求完成时间">{{ model.limitHours }}小时</detail-list-item>
+            <detail-list-item term="预计完成日期">{{ model.limitDate }}</detail-list-item>
           </detail-list>
           <detail-list title="" :col="1">
             <!--<detail-list-item term="故障描述">{{ BaseTool.Object.getField(this.descripitionMap, model.content) }}</detail-list-item>-->
@@ -123,7 +122,7 @@
           </template>
         </span>
       </a-table>
-      <title-divider title="原因分析" width="90px"></title-divider>
+      <title-divider title="维修报告" width="90px"></title-divider>
       <div class="table-operator" >
         <a-button type="primary" @click="handleAddReason">
           <a-icon type="plus"/>
@@ -343,7 +342,7 @@ export default {
           width: '200px'
         },
         {
-          title: '原因分析',
+          title: '维修报告',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'
@@ -515,7 +514,7 @@ export default {
       approve(this.model).then(() => {
         this.$message.info('操作成功')
         this.confirmLoading = false
-        this.handleCancel()
+        this.handleOk()
       })
     },
     handleReturn () {

+ 87 - 76
src/views/repair/application-form/modules/DetailRepair.vue

@@ -5,7 +5,7 @@
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
             <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
-            <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">保养项目</a-button>
+            <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
             <a-button v-if="$auth('repair-application-forms-assign') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 16px" type="primary" @click="handleAssign">派工</a-button>
             <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收?" @confirm="receive">
               <a-button style="margin-left: 8px">接收</a-button>
@@ -29,7 +29,7 @@
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
             <detail-list-item term="预留维修时间">{{ model.limitHours }}</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="计划性维修">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
             <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
@@ -89,82 +89,93 @@
           </div>
         </a-layout-sider>
       </a-layout>
-      <title-divider title="备件清单" width="90px"></title-divider>
-      <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
-        <a-button type="primary" @click="handleSpareStoreSelect">
-          <a-icon type="plus"/>
-          添加
-        </a-button>
-      </div>
-      <a-table
-        :data-source="dataSpare"
-        :columns="columnsSpare"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        tableLayout="auto"
-        rowKey="id">
-        <span slot="actionSpare" slot-scope="record">
-          <template>
-            <a v-if="$auth('repair-application-forms-finish')" @click="handleEditSpare(record)">修改</a>
-            <a-divider type="vertical" />
-            <a-popconfirm v-if="$auth('repair-application-forms-finish')" title="是否要删除该条数据?" @confirm="batchDeleteSpare(record.id)">
-              <a>删除</a>
-            </a-popconfirm>
-          </template>
-        </span>
-      </a-table>
+      <q-tabs :activeKey="activeKey" @change="changeTab">
+        <q-tab-pane key="1" tab="备件清单">
+          <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
+            <a-button type="primary" @click="handleSpareStoreSelect">
+              <a-icon type="plus"/>
+              添加
+            </a-button>
+          </div>
+          <a-table
+            :data-source="dataSpare"
+            :columns="columnsSpare"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+            tableLayout="auto"
+            rowKey="id">
+            <span slot="actionSpare" slot-scope="record">
+              <template>
+                <a v-if="$auth('repair-application-forms-finish')" @click="handleEditSpare(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm v-if="$auth('repair-application-forms-finish')" title="是否要删除该条数据?" @confirm="batchDeleteSpare(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </template>
+            </span>
+          </a-table>
+        </q-tab-pane>
+        <q-tab-pane key="2" tab="费用清单">
+          <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
+            <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
+                  @click="handleEditFee(record)" >修改</operation-button>
+                <operation-button
+                  title="确认删除该笔费用?"
+                  @confirm="batchDeleteFee(record.id)" >删除</operation-button>
+              </template>
+            </span>
+          </a-table>
+        </q-tab-pane>
+        <q-tab-pane key="3" tab="维修报告">
+          <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
+            <a-button type="primary" @click="handleAddReason">
+              <a-icon type="plus"/>
+              添加
+            </a-button>
+          </div>
+          <a-table
+            :data-source="dataReason"
+            :columns="columnsReason"
+            :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+            rowKey="id">
+            <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)"
+                  @click="handleCopyReason(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>
+        </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')">
-        <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
-              @click="handleEditFee(record)" >修改</operation-button>
-            <operation-button
-              title="确认删除该笔费用?"
-              @confirm="batchDeleteFee(record.id)" >删除</operation-button>
-          </template>
-        </span>
-      </a-table>
-      <title-divider title="原因分析" width="90px"></title-divider>
-      <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
-        <a-button type="primary" @click="handleAddReason">
-          <a-icon type="plus"/>
-          添加
-        </a-button>
-      </div>
-      <a-table
-        :data-source="dataReason"
-        :columns="columnsReason"
-        :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
-        rowKey="id">
-        <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)"
-              @click="handleCopyReason(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>
+      <title-divider title="维修报告" width="90px"></title-divider>-->
+
     <!--    <q-tabs :activeKey="activeKey" @change="changeTab">
       <q-tab-pane key="a" tab="配件更换">
        <spare-part-used-select-table :type="2" :table-params="{sbId: model.sbId, modelId: model.modelId, repairId: model.id}" ref="sparePartUsedSelectTable"/>

+ 2 - 2
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'

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

@@ -15,7 +15,7 @@
       <row-list :col="2">
         <row-item>
           <a-form-item
-            label="是否停机"
+            label="计划性维修"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -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

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

@@ -58,11 +58,11 @@
         </row-item>-->
         <row-item>
           <a-form-item
-            label="是否停机"
+            label="计划性维修"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['needStop', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '是否停机不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['needStop', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '计划性维修不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in needStopMap"
                 :key="value"

+ 1 - 1
src/views/repair/application-form/modules/RepairApplicationFormTable.vue

@@ -48,7 +48,7 @@
           <!--          <a @click="handleView(record)">查看</a>-->
           <template v-if="[1,2].includes(type)">
             <operation-button
-              @click="handleViewReason(record)">原因分析</operation-button>
+              @click="handleViewReason(record)">维修报告</operation-button>
             <operation-button
               :type="2"
               title="是否要删除该条数据?"

+ 1 - 1
src/views/repair/form/modules/BaseForm.vue

@@ -122,7 +122,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['descripition', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '是否停机不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['descripition', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '计划性维修不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in descripitionMap"
                 :key="value"

+ 1 - 1
src/views/repair/form/modules/Detail.vue

@@ -14,7 +14,7 @@
           <detail-list-item term="报修单号">{{ model.applicationNo }}</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="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
+          <detail-list-item term="计划性维修">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
           <detail-list-item term="报修人">{{ model.repairUserName }}</detail-list-item>
           <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.applicationSource) }}</detail-list-item>
           <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.applicationLevel)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>

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

@@ -91,10 +91,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>
@@ -114,7 +114,7 @@
                   :value="parseInt(value)">{{ label }}
                 </a-select-option>
               </a-select>
-              <a-button v-show="type==1" style="margin-left: 10px" @ok="handleOk" @click="handleViewCheck()" type="default" >保养项目完善</a-button>
+              <a-button v-show="type==1" style="margin-left: 10px" @ok="handleOk" @click="handleViewCheck()" type="default" >维护项目完善</a-button>
               <a-button v-show="type==2" style="margin-left: 10px" type="default" @ok="handleOk" @click="handleViewBom()">备件bom完善</a-button>
             </a-form-item>
           </a-col>

+ 3 - 3
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' }

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

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

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

@@ -24,7 +24,7 @@
       <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
       <detail-list-item term="维修结束时间">{{ model.repairEndTime }}</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
@@ -155,7 +155,7 @@ export default {
     base (record) {
       this.visible = true
       this.model = record
-      this.modalTitle = '历史故障原因分析'
+      this.modalTitle = '历史故障维修报告'
       queryRepairReason({ repairId: this.model.id }).then(res => {
         this.data = res.data
       })

+ 1 - 1
src/views/repair/repair-reason/modules/RepairReasonTable.vue

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

+ 1 - 1
src/views/sb/info/SbInfoStandard.vue

@@ -268,7 +268,7 @@ export default {
           }
         },
         {
-          title: '保养标准数目',
+          title: '维护标准数目',
           dataIndex: 'standardNum',
           fixed: 'right',
           width: 120,

+ 2 - 2
src/views/sb/info/modules/Detail.vue

@@ -13,8 +13,8 @@
             <a-badge :count="numModelbom" title="备件总数" :number-style="{ backgroundColor: '#52c41a' }">
               <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
             </a-badge>
-            <a-badge :count="numCheckStandard" title="保养项目总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">保养项目</a-button>
+            <a-badge :count="numCheckStandard" title="维护项目总数" :number-style="{ backgroundColor: '#52c41a' }">
+              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
             </a-badge>
             <a-badge :count="numCheckjob" title="保养任务总数" :number-style="{ backgroundColor: '#52c41a' }">
               <a-button style="margin-left: 8px" type="default" @click="handleViewCheckJob()">保养任务</a-button>

+ 2 - 2
src/views/sb/info/modules/DetailBak.vue

@@ -10,8 +10,8 @@
             <a-badge :count="numModelbom" title="备件总数" :number-style="{ backgroundColor: '#52c41a' }">
               <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
             </a-badge>
-            <a-badge :count="numCheckStandard" title="保养项目总数" :number-style="{ backgroundColor: '#52c41a' }">
-              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">保养项目</a-button>
+            <a-badge :count="numCheckStandard" title="维护项目总数" :number-style="{ backgroundColor: '#52c41a' }">
+              <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
             </a-badge>
             <!--            <a-badge :count="numNumCheckjob" title="待保养任务总数" :number-style="{ backgroundColor: '#52c41a' }">
               <a-button style="margin-left: 16px" type="default" @ok="handleOk" @click="checkJobTableWaitDoListView()">待保养任务</a-button>

+ 2 - 2
src/views/sb/modelbom/modules/BaseFormSb.vue

@@ -38,14 +38,14 @@
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="检查部位"
+            label="维护部位"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
               disabled
               style="width: 80%"
-              v-decorator="['sbPartName', {rules: [{required: false, message: '检查部位不能为空'}]}]"/>
+              v-decorator="['sbPartName', {rules: [{required: false, message: '维护部位不能为空'}]}]"/>
             <a-button type="primary" style="width: 20%" @click="handlePartSelect">选择</a-button>
           </a-form-item>
         </a-col>

+ 1 - 1
src/views/sqarepartmanage/sparepartinfo/modules/SparePartInfoSelectModalSbInfo.vue

@@ -180,7 +180,7 @@ export default {
         return selectSpareInfoPageListBySbId(Object.assign(parameter, this.queryParam))
           .then(res => {
             if (res.data.total === 0) {
-              this.$message.info('该设备无bom信息,请先添加后关联保养标准')
+              this.$message.info('该设备无bom信息,请先添加后关联维护标准')
             }
             return res.data
           })