检定完善

src/router/generator-platform-routers.js

@@ -172,9 +172,9 @@ const constantRouterComponents = {
   // 报修单
   'RepairApplicationForm': () => import('@/views/repair/application-form/RepairApplicationForm'),
   // 报修单待审核
-  'RepairApplicationFormExamining': () => import('@/views/repair/application-form/RepairApplicationFormExamining'),
+  // 'RepairApplicationFormExamining': () => import('@/views/repair/application-form/RepairApplicationFormExamining'),
   // 报修单已审核
-  'RepairApplicationFormExamined': () => import('@/views/repair/application-form/RepairApplicationFormExamined'),
+  // 'RepairApplicationFormExamined': () => import('@/views/repair/application-form/RepairApplicationFormExamined'),
   'RepairOut': () => import('@/views/repair/application-form/RepairOut'),
   // 验收单
   'RepairCheckForm': () => import('@/views/repair/application-form/RepairCheckForm'),

src/utils/dict.js

@@ -770,6 +770,7 @@ DictCache.VALUE = {
     NOT_ALLOCATED: 1, // 待分配
     ALLOCATED: 2, // 已分配
     PROCESSING: 3, // 处理中
+    WAIT_SUBMIT: 31, // 处理中
     NOT_ACCEPTANCE: 4, // 待验收
     REBACK: 5, // 已驳回
     FINISHED: 6, // 已完成

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

@@ -221,7 +221,11 @@ export default {
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-
+    // 获取浏览器的请求参数：报修单编号：no
+    const no = this.$route.query.no
+    if (no != null) {
+      this.queryParam.no = no
+    }
     this.tableOption()
   },
   methods: {

src/views/repair/application-form/RepairApplicationFormExamined.vue

@@ -1,297 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div v-show="visible">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-        <a-button style="margin-left: 8px" v-if="$auth('repair-application-forms-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('repair-application-forms-del')">
-          <a-menu slot="overlay">
-            <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
-              <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-            </a-popconfirm>
-          </a-menu>
-          <a-button style="margin-left: 8px">
-            批量操作 <a-icon type="down" />
-          </a-button>
-        </a-dropdown>
-      </div>
-
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record">
-          <template>
-            <a @click="handleView(record)">查看</a>
-            <operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"
-              @click="handleEdit(record)" >审核</operation-button>
-          </template>
-        </span>
-        <span slot="status" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
-        </span>
-      </s-table>
-    </div>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detail ref="detailModal" @ok="handleOk"/>
-    <dispatch-base-form ref="dispatchBaseForm" @ok="handleOk" />
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import Detail from './modules/Detail'
-import { getRepairApplicationFormPage, deleteRepairApplicationForms, fetchRepairApplicationForm, exportRepairApplicationForm } from '@/api/repair/application-form'
-import DispatchBaseForm from '@/views/repair/application-form/modules/DispatchBaseForm'
-
-export default {
-  name: 'RepairApplicationFormList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    Detail,
-    DispatchBaseForm
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-        status: this.DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.EXAMINED
-      },
-      visible: true,
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          checked: true,
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备编号',
-          checked: true,
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '设备名称',
-          checked: true,
-          dataIndex: 'sbId',
-          customRender: (text, record, index) => {
-            return record.sbName
-          }
-        },
-        {
-          title: '报修人',
-          checked: true,
-          dataIndex: 'actualUser'
-        },
-        {
-          title: '维修人',
-          checked: true,
-          dataIndex: 'repairUserName'
-        },
-        {
-          title: '报修来源',
-          checked: true,
-          dataIndex: 'source',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.sourceMap, text)
-          }
-        },
-        {
-          title: '报修时间',
-          checked: true,
-          dataIndex: 'applyTime'
-        },
-        {
-          title: '紧急等级',
-          checked: true,
-          dataIndex: 'level',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.levelMap, text)
-          }
-        },
-        {
-          title: '是否停机',
-          checked: true,
-          dataIndex: 'needStop',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.needStopMap,text)
-          }
-        },
-        {
-          title: '报修状态',
-          checked: true,
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-
-        {
-          title: '创建日期',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '操作',
-          checked: true,
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      sourceMap: {},
-      levelMap: {},
-      statusMap: {},
-      needStopMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          type: 1,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
-    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
-    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteRepairApplicationForms(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        this.visible = false
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.visible = true
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportRepairApplicationForm(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleDispatching (record) {
-      const modal = this.$refs.dispatchBaseForm
-      modal.base(record)
-    }
-  }
-}
-</script>

src/views/repair/application-form/RepairApplicationFormExamining.vue

@@ -1,297 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <div v-show="visible">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-        <a-button style="margin-left: 8px" v-if="$auth('repair-application-forms-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('repair-application-forms-del')">
-          <a-menu slot="overlay">
-            <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
-              <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-            </a-popconfirm>
-          </a-menu>
-          <a-button style="margin-left: 8px">
-            批量操作 <a-icon type="down" />
-          </a-button>
-        </a-dropdown>
-      </div>
-
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record">
-          <template>
-            <a @click="handleView(record)">查看</a>
-            <operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"
-              @click="handleEdit(record)" >审核</operation-button>
-          </template>
-        </span>
-        <span slot="status" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
-        </span>
-      </s-table>
-    </div>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detail-examine ref="detailModal" @ok="handleOk"/>
-    <dispatch-base-form ref="dispatchBaseForm" @ok="handleOk" />
-  </a-card>
-</template>
-
-<script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import DetailExamine from './modules/DetailExamine'
-import { getRepairApplicationFormPage, deleteRepairApplicationForms, fetchRepairApplicationForm, exportRepairApplicationForm } from '@/api/repair/application-form'
-import DispatchBaseForm from '@/views/repair/application-form/modules/DispatchBaseForm'
-
-export default {
-  name: 'RepairApplicationFormList',
-  components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    DetailExamine,
-    DispatchBaseForm
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-        status: this.DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.EXAMINING
-      },
-      visible: true,
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          checked: true,
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备编号',
-          checked: true,
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '设备名称',
-          checked: true,
-          dataIndex: 'sbId',
-          customRender: (text, record, index) => {
-            return record.sbName
-          }
-        },
-        {
-          title: '报修人',
-          checked: true,
-          dataIndex: 'actualUser'
-        },
-        {
-          title: '维修人',
-          checked: true,
-          dataIndex: 'repairUserName'
-        },
-        {
-          title: '报修来源',
-          checked: true,
-          dataIndex: 'source',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.sourceMap, text)
-          }
-        },
-        {
-          title: '报修时间',
-          checked: true,
-          dataIndex: 'applyTime'
-        },
-        {
-          title: '紧急等级',
-          checked: true,
-          dataIndex: 'level',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.levelMap, text)
-          }
-        },
-        {
-          title: '是否停机',
-          checked: true,
-          dataIndex: 'needStop',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.needStopMap,text)
-          }
-        },
-        {
-          title: '报修状态',
-          checked: true,
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-
-        {
-          title: '创建日期',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '操作',
-          checked: true,
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      sourceMap: {},
-      levelMap: {},
-      statusMap: {},
-      needStopMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          type: 1,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
-    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
-    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteRepairApplicationForms(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        this.visible = false
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.visible = true
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportRepairApplicationForm(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleDispatching (record) {
-      const modal = this.$refs.dispatchBaseForm
-      modal.base(record)
-    }
-  }
-}
-</script>

src/views/repair/application-form/RepairCheckForm.vue

@@ -83,7 +83,7 @@ export default {
     return {
       // 查询参数
       queryParam: {
-        filter: 0,
+        filter: -1,
         searchType: 3
       },
       visible: true,
@@ -209,7 +209,11 @@ export default {
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-
+    // 获取浏览器的请求参数：报修单编号：no
+    const no = this.$route.query.no
+    if (no != null) {
+      this.queryParam.no = no
+    }
     this.tableOption()
   },
   methods: {

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

@@ -1,113 +1,183 @@
 <template>
-  <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
-    <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 style="margin-left: 8px" @click="handleCancel">返回</a-button>
-        </span>
-      </a-col>
-    </a-row>
-    <a-layout>
-      <a-layout-content style="background-color: rgb(255, 255, 255)">
-        <a-divider orientation="left">报修详情</a-divider>
-        <detail-list title="" :col="3">
-          <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="报修人">{{ model.userName }}</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="报修时间">{{ 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>
-        <detail-list title="" :col="1">
-          <!--<detail-list-item term="故障描述">{{ BaseTool.Object.getField(this.descripitionMap, model.content) }}</detail-list-item>-->
-          <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-        </detail-list>
-        <detail-list title="维修图片：" :col="6">
-          <upload-image-detail :images-list="model.repairFileList"/>
-        </detail-list>
-        <a-divider orientation="left">维修详情</a-divider>
-        <detail-list title="" :col="3">
-          <detail-list-item term="故障类别">{{ model.repairErrorTypeName }}</detail-list-item>
-          <detail-list-item term="维修开始时间">{{ model.repairStartTime }}</detail-list-item>
-          <detail-list-item term="维修结束时间">{{ model.repairEndTime }}</detail-list-item>
-          <detail-list-item term="维修耗时">{{ model.repairMinutes }}</detail-list-item>
-          <detail-list-item term="维修人员">{{ model.repairUserName }}</detail-list-item>
-          <!--<detail-list-item term="维修次数">{{ model.repairTimes }}</detail-list-item>-->
-        </detail-list>
-        <detail-list title="" :col="1">
-          <detail-list-item term="维修描述">{{ model.repairContent }}</detail-list-item>
-        </detail-list>
-        <detail-list title="维修图片：" :col="6">
-          <upload-image-detail :images-list="model.repairFileList"/>
-        </detail-list>
-        <a-divider v-if="dispatchList != null" orientation="left">转派详情</a-divider>
-        <detail-list v-for="item in dispatchList" title="" :col="3">
-          <detail-list-item term="转派人">{{ item.username }}</detail-list-item>
-          <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>
-        <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>
-        <detail-list title="验收图片：" :col="6">
-          <upload-image-detail :images-list="model.checkFileList"/>
-        </detail-list>
-      </a-layout-content>
-      <a-layout-sider style="background-color: rgb(255, 255, 255)">
-        <div style="margin-top: 30px;margin-left: 30px;">
-          <a-steps progress-dot :current="6" direction="vertical" >
-            <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-steps>
-        </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)">
-    </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)">
-    </div>
-    <a-table
-      :data-source="dataSpare"
-      :columns="columnsSpare"
-      tableLayout="auto"
-      rowKey="id">
+  <div>
+    <a-card :bordered="false" :loading="loading" v-show="visible" class="card" :title="modalTitle">
+      <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 style="margin-left: 8px" @click="handleCancel">返回</a-button>
+          </span>
+        </a-col>
+      </a-row>
+      <a-layout>
+        <a-layout-content style="background-color: rgb(255, 255, 255)">
+          <a-divider orientation="left">报修详情</a-divider>
+          <detail-list title="" :col="3">
+            <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="报修人">{{ model.userName }}</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="报修时间">{{ 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>
+          <detail-list title="" :col="1">
+            <!--<detail-list-item term="故障描述">{{ BaseTool.Object.getField(this.descripitionMap, model.content) }}</detail-list-item>-->
+            <detail-list-item term="故障描述">{{ model.content }}</detail-list-item>
+          </detail-list>
+          <detail-list title="报修图片：" :col="6">
+            <upload-image-detail :images-list="model.applicationFileList"/>
+          </detail-list>
+          <a-divider orientation="left">维修详情</a-divider>
+          <detail-list title="" :col="3">
+            <detail-list-item term="故障类别">{{ model.repairErrorTypeName }}</detail-list-item>
+            <detail-list-item term="维修开始时间">{{ model.repairStartTime }}</detail-list-item>
+            <detail-list-item term="维修结束时间">{{ model.repairEndTime }}</detail-list-item>
+            <detail-list-item term="维修耗时">{{ model.repairMinutes }}</detail-list-item>
+            <detail-list-item term="维修人员">{{ model.repairUserName }}</detail-list-item>
+            <!--<detail-list-item term="维修次数">{{ model.repairTimes }}</detail-list-item>-->
+          </detail-list>
+          <detail-list title="" :col="1">
+            <detail-list-item term="维修描述">{{ model.repairContent }}</detail-list-item>
+          </detail-list>
+          <detail-list title="维修图片：" :col="6">
+            <upload-image-detail :images-list="model.repairFileList"/>
+          </detail-list>
+          <a-divider v-if="dispatchList != null" orientation="left">转派详情</a-divider>
+          <detail-list v-for="item in dispatchList" title="" :col="3">
+            <detail-list-item term="转派人">{{ item.username }}</detail-list-item>
+            <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>
+          <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>
+          <detail-list title="验收图片：" :col="6">
+            <upload-image-detail :images-list="model.checkFileList"/>
+          </detail-list>
+        </a-layout-content>
+        <a-layout-sider style="background-color: rgb(255, 255, 255)">
+          <div style="margin-top: 30px;margin-left: 30px;">
+            <a-steps progress-dot :current="6" direction="vertical" >
+              <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-steps>
+          </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>-->
+      <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>-->
+      <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>-->
 
-    </a-table>
-    <!--<q-tabs :activeKey="activeKey" @change="changeTab">
+        <!--            <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>
-    <finish-form ref="finishForm" @ok="handleOk" />
-    <dispatch-form ref="dispatchForm" @ok="handleCancel" />-->
+    </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>-->
+      <a-table
+        :data-source="dataReason"
+        :columns="columnsReason"
+        tableLayout="fixed"
+        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)"-->
+            <!--              :type="2"-->
+            <!--              title="确认删除该记录？"-->
+            <!--              @confirm="batchDeleteReason(record.id)" >删除</operation-button>-->
+          </template>
+        </span>
+      </a-table>
+
+    </a-card>
     <check-form ref="checkForm" @ok="handleOk" />
-  </a-card>
+    <fee-base-form ref="feeForm" @ok="handleOk" />
+    <reason-base-form ref="reasonForm" @ok="handleOk" />
+    <finish-form ref="finishForm" @ok="handleOk" />
+    <dispatch-form ref="dispatchForm" @ok="handleCancel" />
+    <fee-detail ref="feeDetail" @ok="handleOk" />
+    <reason-detail ref="reasonDetail" @ok="handleOk" />
+  </div>
 </template>
 
 <script>
@@ -120,6 +190,12 @@ import SparePartUsedSelectTable from '@/views/sqarepartmanage/sparepartused/modu
 import SparePickFormSelectTable from '@/views/store/sparepickform/modules/SparePickFormSelectTable'
 import { selectSparePartUsedListByRepairId } from '@/api/sqarepartmanage/sparepartused'
 import { selectRepairProjectListByRepairId } from '@/api/repair/repairprojectrelation'
+import FeeBaseForm from '@/views/repair/fee/modules/BaseForm'
+import ReasonBaseForm from '@/views/repair/repair-reason/modules/BaseForm'
+import FeeDetail from '@/views/repair/fee/modules/Detail'
+import ReasonDetail from '@/views/repair/repair-reason/modules/Detail'
+import { deleteRepairFees, fetchRepairFee, queryRepairFee } from '@/api/repair/fee'
+import { deleteRepairReasons, fetchRepairReason, queryRepairReason } from '@/api/repair/repair-reason'
 const DetailListItem = DetailList.Item
 
 export default {
@@ -129,6 +205,10 @@ export default {
     DetailList,
     DetailListItem,
     FinishForm,
+    FeeDetail,
+    ReasonDetail,
+    FeeBaseForm,
+    ReasonBaseForm,
     DispatchForm,
     SparePartUsedSelectTable,
     SparePickFormSelectTable
@@ -142,15 +222,19 @@ export default {
       dispatchList: [],
       activeKey: 'a',
       visible: false,
+      loading: false,
       // 下拉框map
       sourceMap: {},
-      descripitionMap: {},
       levelMap: {},
+      descripitionMap: {},
       statusMap: {},
+      typeMap: {},
       repairProjectMap: {},
       repairTechnologyMap: {},
       data: [],
       dataSpare: [],
+      dataFee: [],
+      dataReason: [],
       // 表头
       columns: [
         {
@@ -223,6 +307,81 @@ export default {
           dataIndex: 'totalPrice'
         }
       ],
+      columnsFee: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          customRender: (text, record, index) => {
+            return `${index + 1}`
+          }
+        },
+        {
+          title: '费用金额',
+          dataIndex: 'fee',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '费用类别',
+          dataIndex: 'type',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.typeMap, text)
+          }
+        },
+        {
+          title: '费用原因',
+          dataIndex: 'reason'
+        },
+        {
+          title: '费用描述',
+          dataIndex: 'descripition'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        }
+      ],
+      columnsReason: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          width: '70',
+          customRender: (text, record, index) => {
+            return `${index + 1}`
+          }
+        },
+        {
+          title: '分析时间',
+          dataIndex: 'analyzeTime',
+          width: '200px'
+        },
+        {
+          title: '问题描述',
+          dataIndex: 'problemDesc',
+          ellipsis: true,
+          width: '200px'
+        },
+        {
+          title: '原因分析',
+          dataIndex: 'reasonAnalysis',
+          ellipsis: true,
+          width: '200px'
+        },
+        {
+          title: '改进措施',
+          dataIndex: 'improveMeasure',
+          ellipsis: true,
+          width: '200px'
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
       model: {
         'id': null,
         'sbId': null,
@@ -258,7 +417,8 @@ export default {
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.repairProjectMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_PROJECT_TYPE)
     this.repairTechnologyMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_TECHNOLOGY_TYPE)
-    this.descripitionMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIRE_ACTION)
+    this.descripitionMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_QUESTION)
+    this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
   },
   methods: {
     base (record) {
@@ -266,12 +426,21 @@ export default {
       this.modalTitle = '详情'
       this.model = record
       this.dispatchList = JSON.parse(record.repairDispatchList)
-      selectRepairProjectListByRepairId({ id: record.id }).then(res => {
+      this.init()
+    },
+    init () {
+      selectRepairProjectListByRepairId({ id: this.model.id }).then(res => {
         this.data = res.data
       })
-      selectSparePartUsedListByRepairId({ id: record.id }).then(res => {
+      selectSparePartUsedListByRepairId({ id: this.model.id }).then(res => {
         this.dataSpare = res.data
       })
+      queryRepairFee({ repairId: this.model.id }).then(res => {
+        this.dataFee = res.data
+      })
+      queryRepairReason({ repairId: this.model.id }).then(res => {
+        this.dataReason = res.data
+      })
     },
     handleCancel () {
       this.visible = false
@@ -284,6 +453,76 @@ export default {
         this.handleOk()
       })
     },
+    batchDeleteFee (id) {
+      let ids = []
+      if (this.BaseTool.String.isBlank(id)) {
+        const length = this.selectedRows.length
+        if (length === 0) {
+          this.$message.info('请选择要删除的记录')
+          return
+        }
+        ids = this.selectedRows.map(item => item.id)
+      } else {
+        ids = [id]
+      }
+      deleteRepairFees(ids).then(res => {
+        this.$message.info('删除成功')
+        this.handleOk()
+        this.$refs.table.clearSelected()
+      })
+    },
+    handleAddFee () {
+      const modal = this.$refs.feeForm
+      modal.base(null, this.model)
+    },
+    handleEditFee (record) {
+      fetchRepairFee({ id: record.id }).then(res => {
+        const modal = this.$refs.feeForm
+        modal.base(res.data, this.model)
+      })
+    },
+    handleViewFee (record) {
+      fetchRepairFee({ id: record.id }).then(res => {
+        const modal = this.$refs.feeDetail
+        modal.base(res.data)
+      })
+    },
+    batchDeleteReason (id) {
+      let ids = []
+      if (this.BaseTool.String.isBlank(id)) {
+        const length = this.selectedRows.length
+        if (length === 0) {
+          this.$message.info('请选择要删除的记录')
+          return
+        }
+        ids = this.selectedRows.map(item => item.id)
+      } else {
+        ids = [id]
+      }
+      deleteRepairReasons(ids).then(res => {
+        this.$message.info('删除成功')
+        this.handleOk()
+        this.$refs.table.clearSelected()
+      })
+    },
+    handleAddReason () {
+      const modal = this.$refs.reasonForm
+      this.visible = false
+      modal.base(null, this.model)
+    },
+    handleEditReason (record) {
+      fetchRepairReason({ id: record.id }).then(res => {
+        const modal = this.$refs.reasonForm
+        this.visible = false
+        modal.base(res.data, this.model)
+      })
+    },
+    handleViewReason (record) {
+      fetchRepairReason({ id: record.id }).then(res => {
+        const modal = this.$refs.reasonDetail
+        modal.base(res.data)
+      })
+    },
     handleApprove () {
       approve(this.model).then(() => {
         this.$message.info('操作成功')
@@ -291,20 +530,26 @@ export default {
       })
     },
     handleReturn () {
-      console.log('11111')
       const modal = this.$refs.checkForm
       modal.base(this.model)
     },
     handleOk () {
+      this.loading = true
       fetchRepairApplicationForm({ id: this.model.id }).then(res => {
+        this.loading = false
         this.model = res.data
+        this.visible = true
         this.dispatchList = JSON.parse(this.model.repairDispatchList)
+        this.init()
       })
     },
     handleFinish () {
       const modal = this.$refs.finishForm
       modal.base(this.model)
     },
+    handleSpareSelect () {
+      this.$refs.spareSelectModal.base()
+    },
     handleDispatch () {
       const modal = this.$refs.dispatchForm
       modal.base(this.model)

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

@@ -13,7 +13,7 @@
             <a-button v-if="$auth('repair-application-forms-out') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING >= model.status) && model.type != 2" style="margin-left: 8px" type="primary" @click="handleOut">委外</a-button>
             <a-button v-if="$auth('repair-application-forms-dispatch') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 8px" type="primary" @click="handleDispatch">转派</a-button>
             <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="primary" @click="handleFinish()">维修完成</a-button>
-            <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.FINISHED === model.status" title="是否要提交审核该条数据？" @confirm="handleExamine">
+            <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.WAIT_SUBMIT === model.status" title="是否要提交审核该条数据？" @confirm="handleExamine">
               <a-button style="margin-left: 8px" type="primary">提交审核</a-button>
             </a-popconfirm>
             <a-button style="margin-left: 8px" @click="handleCancel">返回</a-button>

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

@@ -3,7 +3,7 @@
     <a-row :gutter="48" slot="extra">
       <a-col :md="48" :sm="48">
         <span class="table-page-search-submitButtons" style="float: right" >
-          <a-button style="margin-left: 8px" type="primary" @click="finish()">完成</a-button>
+<!--          <a-button style="margin-left: 8px" type="primary" @click="finish()">完成</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>
@@ -207,7 +207,7 @@
 </template>
 
 <script>
-import { addRepairReason, updateRepairReason, finishRepairReason} from '@/api/repair/repair-reason'
+import { addRepairReason, updateRepairReason, finishRepairReason } from '@/api/repair/repair-reason'
 import pick from 'lodash.pick'
 
 export default {
@@ -326,7 +326,7 @@ export default {
         }
       })
     },
-    finish(){
+    finish () {
       const { form: { validateFieldsAndScroll } } = this
       this.confirmLoading = true
       validateFieldsAndScroll((errors, values) => {
@@ -346,8 +346,8 @@ export default {
             this.confirmLoading = false
             this.handleCancel()
           }).catch(() => {
-          this.confirmLoading = false
-        })
+            this.confirmLoading = false
+          })
       })
     },
     handleCancel (values) {