xiongchao преди 3 години
родител
ревизия
0541a9a90e

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

@@ -247,7 +247,7 @@ export default {
       defaultApplicationFileList: [],
       defaultCheckFileList: [],
       applicationFileList: [], // 报修图片
-      checkFileList: [], // 验收图片
+      checkFileList: [], // 审核图片
       repairFileList: [], // 维修图片,
       headers: {
         Authorization: 'Bearer ' + Vue.ls.get(ACCESS_TOKEN)

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

@@ -4,7 +4,7 @@
       <a-row :gutter="48" slot="extra">
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
-            <a-button v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="primary" @click="handleApprove()">验收</a-button>
+            <a-button v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="primary" @click="handleApprove()">审核</a-button>
             <a-button v-if="$auth('repair-application-forms-reback') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="danger" @click="handleReturn()">驳回</a-button>
             <a-button style="margin-left: 8px" @click="handleCancel">返回</a-button>
           </span>
@@ -55,14 +55,14 @@
             <detail-list-item term="转派时间">{{ item.time }}</detail-list-item>
             <detail-list-item term="转派备注">{{ item.remark }}</detail-list-item>
           </detail-list>
-          <a-divider orientation="left">验收详情</a-divider>
+          <a-divider orientation="left">审核详情</a-divider>
           <detail-list title="" :col="3">
-            <detail-list-item term="验收开始时间">{{ model.checkStartTime }}</detail-list-item>
-            <detail-list-item term="验收结束时间">{{ model.checkEndTime }}</detail-list-item>
-            <detail-list-item term="验收人员">{{ model.checkUserName }}</detail-list-item>
-            <detail-list-item term="验收描述">{{ model.checkContent }}</detail-list-item>
+            <detail-list-item term="审核开始时间">{{ model.checkStartTime }}</detail-list-item>
+            <detail-list-item term="审核结束时间">{{ model.checkEndTime }}</detail-list-item>
+            <detail-list-item term="审核人员">{{ model.checkUserName }}</detail-list-item>
+            <detail-list-item term="审核描述">{{ model.checkContent }}</detail-list-item>
           </detail-list>
-          <detail-list title="验收图片:" :col="6">
+          <detail-list title="审核图片:" :col="6">
             <upload-image-detail :images-list="model.checkFileList"/>
           </detail-list>
         </a-layout-content>
@@ -72,8 +72,8 @@
               <a-step title="报修时间:" :description="''+model.applyTime?model.applyTime:''" />
               <a-step title="维修开始时间:" :description="''+model.repairStartTime?model.repairStartTime:''" />
               <a-step title="维修结束时间:" :description="''+model.repairEndTime?model.repairEndTime:''" />
-              <a-step title="验收开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
-              <a-step title="验收结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
+              <a-step title="审核开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
+              <a-step title="审核结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
             </a-steps>
           </div>
         </a-layout-sider>
@@ -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'

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

@@ -4,8 +4,8 @@
       <a-row :gutter="48" slot="extra">
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
-            <a-button v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="primary" @click="handleApprove()">验收</a-button>
-            <a-button v-if="$auth('repair-application-forms-reback') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="danger" @click="handleReturn()">驳回</a-button>
+            <a-button v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="primary" @click="handleApprove()">接受</a-button>
+            <a-button v-if="$auth('repair-application-forms-reback') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="danger" @click="handleReturn()">拒绝</a-button>
             <a-button style="margin-left: 8px" @click="handleCancel">返回</a-button>
           </span>
         </a-col>
@@ -55,14 +55,14 @@
             <detail-list-item term="转派时间">{{ item.time }}</detail-list-item>
             <detail-list-item term="转派备注">{{ item.remark }}</detail-list-item>
           </detail-list>
-          <a-divider orientation="left">验收详情</a-divider>
+          <a-divider orientation="left">审核详情</a-divider>
           <detail-list title="" :col="3">
-            <detail-list-item term="验收开始时间">{{ model.checkStartTime }}</detail-list-item>
-            <detail-list-item term="验收结束时间">{{ model.checkEndTime }}</detail-list-item>
-            <detail-list-item term="验收人员">{{ model.checkUserName }}</detail-list-item>
-            <detail-list-item term="验收描述">{{ model.checkContent }}</detail-list-item>
+            <detail-list-item term="审核开始时间">{{ model.checkStartTime }}</detail-list-item>
+            <detail-list-item term="审核结束时间">{{ model.checkEndTime }}</detail-list-item>
+            <detail-list-item term="审核人员">{{ model.checkUserName }}</detail-list-item>
+            <detail-list-item term="审核描述">{{ model.checkContent }}</detail-list-item>
           </detail-list>
-          <detail-list title="验收图片:" :col="6">
+          <detail-list title="审核图片:" :col="6">
             <upload-image-detail :images-list="model.checkFileList"/>
           </detail-list>
         </a-layout-content>
@@ -72,8 +72,8 @@
               <a-step title="报修时间:" :description="''+model.applyTime?model.applyTime:''" />
               <a-step title="维修开始时间:" :description="''+model.repairStartTime?model.repairStartTime:''" />
               <a-step title="维修结束时间:" :description="''+model.repairEndTime?model.repairEndTime:''" />
-              <a-step title="验收开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
-              <a-step title="验收结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
+              <a-step title="审核开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
+              <a-step title="审核结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
             </a-steps>
           </div>
         </a-layout-sider>
@@ -117,7 +117,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"/>
@@ -336,7 +336,7 @@ export default {
           width: '200px'
         },
         {
-          title: '维修报告',
+          title: '原因分析',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
           width: '200px'

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

@@ -55,14 +55,14 @@
             <detail-list-item term="转派时间">{{ item.time }}</detail-list-item>
             <detail-list-item term="转派备注">{{ item.remark }}</detail-list-item>
           </detail-list>
-          <a-divider orientation="left">验收详情</a-divider>
+          <a-divider orientation="left">审核详情</a-divider>
           <detail-list title="" :col="3">
-            <detail-list-item term="验收开始时间">{{ model.checkStartTime }}</detail-list-item>
-            <detail-list-item term="验收结束时间">{{ model.checkEndTime }}</detail-list-item>
-            <detail-list-item term="验收人员">{{ model.checkUserName }}</detail-list-item>
-            <detail-list-item term="验收描述">{{ model.checkContent }}</detail-list-item>
+            <detail-list-item term="审核开始时间">{{ model.checkStartTime }}</detail-list-item>
+            <detail-list-item term="审核结束时间">{{ model.checkEndTime }}</detail-list-item>
+            <detail-list-item term="审核人员">{{ model.checkUserName }}</detail-list-item>
+            <detail-list-item term="审核描述">{{ model.checkContent }}</detail-list-item>
           </detail-list>
-          <detail-list title="验收图片:" :col="6">
+          <detail-list title="审核图片:" :col="6">
             <upload-image-detail :images-list="model.checkFileList"/>
           </detail-list>
         </a-layout-content>
@@ -72,8 +72,8 @@
               <a-step title="报修时间:" :description="''+model.applyTime?model.applyTime:''" />
               <a-step title="维修开始时间:" :description="''+model.repairStartTime?model.repairStartTime:''" />
               <a-step title="维修结束时间:" :description="''+model.repairEndTime?model.repairEndTime:''" />
-              <a-step title="验收开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
-              <a-step title="验收结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
+              <a-step title="审核开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
+              <a-step title="审核结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
             </a-steps>
           </div>
         </a-layout-sider>
@@ -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'

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

@@ -64,14 +64,14 @@
             <detail-list-item term="转派时间">{{ item.time }}</detail-list-item>
             <detail-list-item term="转派备注">{{ item.remark }}</detail-list-item>
           </detail-list>
-          <a-divider orientation="left">验收详情</a-divider>
+          <a-divider orientation="left">审核详情</a-divider>
           <detail-list title="" :col="3">
-            <detail-list-item term="验收开始时间">{{ model.checkStartTime }}</detail-list-item>
-            <detail-list-item term="验收结束时间">{{ model.checkEndTime }}</detail-list-item>
-            <detail-list-item term="验收人员">{{ model.checkUserName }}</detail-list-item>
-            <detail-list-item term="验收描述">{{ model.checkContent }}</detail-list-item>
+            <detail-list-item term="审核开始时间">{{ model.checkStartTime }}</detail-list-item>
+            <detail-list-item term="审核结束时间">{{ model.checkEndTime }}</detail-list-item>
+            <detail-list-item term="审核人员">{{ model.checkUserName }}</detail-list-item>
+            <detail-list-item term="审核描述">{{ model.checkContent }}</detail-list-item>
           </detail-list>
-          <detail-list title="验收图片:" :col="6">
+          <detail-list title="审核图片:" :col="6">
             <upload-image-detail :images-list="model.checkFileList"/>
           </detail-list>
         </a-layout-content>
@@ -81,8 +81,8 @@
               <a-step title="报修时间:" :description="''+model.applyTime?model.applyTime:''" />
               <a-step title="维修开始时间:" :description="''+model.repairStartTime?model.repairStartTime:''" />
               <a-step title="维修结束时间:" :description="''+model.repairEndTime?model.repairEndTime:''" />
-              <a-step title="验收开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
-              <a-step title="验收结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
+              <a-step title="审核开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
+              <a-step title="审核结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
             </a-steps>
           </div>
         </a-layout-sider>
@@ -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">
         <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'

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

@@ -33,14 +33,14 @@
           <detail-list title="维修图片:" :col="6">
             <upload-image-detail :images-list="model.repairFileList"/>
           </detail-list>
-          <a-divider orientation="left">验收详情</a-divider>
+          <a-divider orientation="left">审核详情</a-divider>
           <detail-list title="" :col="3">
-            <detail-list-item term="验收开始时间">{{ model.checkStartTime }}</detail-list-item>
-            <detail-list-item term="验收结束时间">{{ model.checkEndTime }}</detail-list-item>
-            <detail-list-item term="验收人员">{{ model.checkUserName }}</detail-list-item>
-            <detail-list-item term="验收描述">{{ model.checkContent }}</detail-list-item>
+            <detail-list-item term="审核开始时间">{{ model.checkStartTime }}</detail-list-item>
+            <detail-list-item term="审核结束时间">{{ model.checkEndTime }}</detail-list-item>
+            <detail-list-item term="审核人员">{{ model.checkUserName }}</detail-list-item>
+            <detail-list-item term="审核描述">{{ model.checkContent }}</detail-list-item>
           </detail-list>
-          <detail-list title="验收图片:" :col="6">
+          <detail-list title="审核图片:" :col="6">
             <upload-image-detail :images-list="model.checkFileList"/>
           </detail-list>
         </a-layout-content>
@@ -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/DispatchBaseForm.vue

@@ -133,11 +133,11 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="验收人"
+            label="审核人"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['checkUserId', {rules: [{required: true, message: '验收人不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['checkUserId', {rules: [{required: true, message: '审核人不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="item in userList"
                 :key="item.userId"

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

@@ -19,7 +19,7 @@
             :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']" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in needStopMap"
                 :key="value"
@@ -96,7 +96,7 @@
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
           >
-            <a-textarea v-decorator="['repairContent', {rules: [{required: true, message: '维修描述不能为空'}]}]"/>
+            <a-textarea v-decorator="['repairContent']"/>
           </a-form-item>
         </row-item>
         <row-item>
@@ -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

+ 4 - 4
src/views/repair/check/RepairCheck.vue

@@ -149,25 +149,25 @@ export default {
           }
         },
         {
-          title: '验收开始时间',
+          title: '审核开始时间',
           dataIndex: 'startTime',
           checked: true,
           width: 200
         },
         {
-          title: '验收结束时间',
+          title: '审核结束时间',
           dataIndex: 'endTime',
           checked: true,
           width: 200
         },
         {
-          title: '验收描述',
+          title: '审核描述',
           dataIndex: 'descripition',
           checked: false,
           width: 200
         },
         {
-          title: '验收状态',
+          title: '审核状态',
           dataIndex: 'status',
           checked: true,
           width: 100,

+ 8 - 8
src/views/repair/check/modules/BaseForm.vue

@@ -72,7 +72,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="验收开始时间"
+            label="审核开始时间"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -80,13 +80,13 @@
               showTime
               style="width: 100%"
               :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              v-decorator="['startTime', {rules: [{required: true, message: '验收开始时间不能为空'}]}]" />
+              v-decorator="['startTime', {rules: [{required: true, message: '审核开始时间不能为空'}]}]" />
           </a-form-item>
 
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="验收结束时间"
+            label="审核结束时间"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -94,7 +94,7 @@
               showTime
               style="width: 100%"
               :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              v-decorator="['endTime', {rules: [{required: true, message: '验收结束时间不能为空'}]}]" />
+              v-decorator="['endTime', {rules: [{required: true, message: '审核结束时间不能为空'}]}]" />
           </a-form-item>
 
         </a-col>
@@ -113,12 +113,12 @@
         </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
-              v-decorator="['descripition', {rules: [{required: true, message: '验收描述不能为空'}]}]" />
+              v-decorator="['descripition', {rules: [{required: true, message: '审核描述不能为空'}]}]" />
           </a-form-item>
 
         </a-col>
@@ -126,11 +126,11 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="验收状态"
+            label="审核状态"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['status', {initialValue: DictCache.VALUE.REPAIR_CHECK_STATUS.NOT_ACCEPTANCED,rules: [{required: true, message: '验收状态不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['status', {initialValue: DictCache.VALUE.REPAIR_CHECK_STATUS.NOT_ACCEPTANCED,rules: [{required: true, message: '审核状态不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in statusMap"
                 :key="value"

+ 2 - 2
src/views/repair/check/modules/CheckForm.vue

@@ -138,7 +138,7 @@
           </a-form-item>
         </row-item>
       </row-list>
-      <a-divider orientation="left">验收</a-divider>
+      <a-divider orientation="left">审核</a-divider>
       <row-list :col="1">
         <row-item>
           <a-form-item
@@ -148,7 +148,7 @@
           >
             <a-textarea
               :rows="4"
-              v-decorator="['descripition', {rules: [{required: true, message: '验收描述不能为空'}]}]"/>
+              v-decorator="['descripition', {rules: [{required: true, message: '审核描述不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>

+ 5 - 5
src/views/repair/check/modules/Detail.vue

@@ -27,14 +27,14 @@
     <detail-list title="" :col="1">
       <detail-list-item term="维修描述">{{ model.repairDescripition }}</detail-list-item>
     </detail-list>
-    <a-divider orientation="left">验收详情</a-divider>
+    <a-divider orientation="left">审核详情</a-divider>
     <detail-list title="" :col="2">
-      <detail-list-item term="验收开始时间">{{ model.startTime }}</detail-list-item>
-      <detail-list-item term="验收结束时间">{{ model.endTime }}</detail-list-item>
+      <detail-list-item term="审核开始时间">{{ model.startTime }}</detail-list-item>
+      <detail-list-item term="审核结束时间">{{ model.endTime }}</detail-list-item>
       <detail-list-item term="维修人员">{{ model.checkUserName }}</detail-list-item>
-      <detail-list-item term="验收描述">{{ model.descripition }}</detail-list-item>
+      <detail-list-item term="审核描述">{{ model.descripition }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="验收状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_CHECK_STATUS[model.status]"/></detail-list-item>
+      <detail-list-item term="审核状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_CHECK_STATUS[model.status]"/></detail-list-item>
     </detail-list>
 
     <template slot="footer">

+ 4 - 4
src/views/repair/check/modules/RepairCheckSelectModal.vue

@@ -123,11 +123,11 @@ export default {
           dataIndex: 'repairId'
         },
         {
-          title: '验收开始时间',
+          title: '审核开始时间',
           dataIndex: 'startTime'
         },
         {
-          title: '验收结束时间',
+          title: '审核结束时间',
           dataIndex: 'endTime'
         },
         {
@@ -135,11 +135,11 @@ export default {
           dataIndex: 'repairUseId'
         },
         {
-          title: '验收描述',
+          title: '审核描述',
           dataIndex: 'descripition'
         },
         {
-          title: '验收状态',
+          title: '审核状态',
           dataIndex: 'status',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.statusMap, text)

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

@@ -40,14 +40,14 @@
           <detail-list-item term="转派备注">{{ item.remark }}</detail-list-item>
         </detail-list>
 
-        <a-divider orientation="left">验收详情</a-divider>
+        <a-divider orientation="left">审核详情</a-divider>
           <detail-list title="" :col="2">
-            <detail-list-item term="验收开始时间">{{ model.startTime }}</detail-list-item>
-            <detail-list-item term="验收结束时间">{{ model.endTime }}</detail-list-item>
+            <detail-list-item term="审核开始时间">{{ model.startTime }}</detail-list-item>
+            <detail-list-item term="审核结束时间">{{ model.endTime }}</detail-list-item>
             <detail-list-item term="维修人员">{{ model.checkUserName }}</detail-list-item>
-            <detail-list-item term="验收描述">{{ model.descripition }}</detail-list-item>
+            <detail-list-item term="审核描述">{{ model.descripition }}</detail-list-item>
             <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-            <detail-list-item term="验收状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_CHECK_STATUS[model.status]"/></detail-list-item>
+            <detail-list-item term="审核状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_CHECK_STATUS[model.status]"/></detail-list-item>
         </detail-list>
       </a-layout-content>
       <a-layout-sider style="background-color: rgb(255, 255, 255)">
@@ -57,8 +57,8 @@
             <a-step title="派工时间:" :description="''+model.applicationApplyTime?model.applicationApplyTime:''" />
             <a-step title="维修开始时间:" :description="''+model.startTime?model.startTime:''" />
             <a-step title="维修结束时间:" :description="''+model.endTime?model.endTime:''" />
-            <a-step title="验收开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
-            <a-step title="验收结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
+            <a-step title="审核开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
+            <a-step title="审核结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
           </a-steps>
         </div>
       </a-layout-sider>

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

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

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

+ 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

@@ -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>

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

+ 0 - 17
src/views/sb/info/MeasureSbInfo.vue

@@ -91,7 +91,6 @@
             <!--            <a-button v-if="$auth('sb-infos-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>-->
             <a-button v-if="$auth('sb-infos-add')" type="primary" icon="plus" @click="handleAddRelate">关联</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="upload" @click="doImport">初始化导入</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="upload" @click="printQcode()">打印</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-infos-del')">
               <a-menu slot="overlay">
@@ -552,22 +551,6 @@ export default {
     onExpand (expandedKeys) {
       this.expandedKeys = expandedKeys
       this.autoExpandParent = false
-    },
-    doImport () {
-      if (this.queryParam.useCompany == null) {
-        this.$message.error('请先选择公司')
-        return
-      }
-      if (this.queryParam.useProject == null) {
-        this.$message.error('请先选择项目部')
-        return
-      }
-      this.$refs.importModal.base(this.queryParam.useCompany, this.queryParam.useProject)
-    },
-    doImportDe () {
-      this.queryParam.useCompany = null
-      this.queryParam.useProject = null
-      this.$refs.importModal.base()
     }
   }
 }