完善

src/views/activiti/History.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="card" :title="modalTitle">
+  <div>
     <title-divider title="审批信息" width="90px"></title-divider>
     <a-table
       :columns="auditColumns"
@@ -40,7 +40,7 @@
         </a-col>
       </a-row>
     </div>
-  </a-card>
+  </div>
 </template>
 
 <script>
@@ -128,7 +128,6 @@ export default {
   },
   methods: {
     base () {
-      this.modalTitle = '审批'
       this.getAuditRecords()
       this.getImage()
     },

src/views/activiti/task/MyStart.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false">
-    <div v-if="visible">
+    <div v-show="visible">
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
@@ -43,6 +43,7 @@ import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPageStart } from '@/api/activiti/activiti'
+import { fetchSbScrapForm } from '@/api/sb/scraps'
 
 export default {
   name: 'TaskList',
@@ -151,7 +152,9 @@ export default {
     handleView (record) {
       this.visible = false
       if (record.targetCode === 'sb_info_scrap') {
-        this.$refs.detailAuditScrapModal.base(record)
+        fetchSbScrapForm({ id: record.targetId }).then(res => {
+          this.$refs.detailAuditScrapModal.base(record, res.data)
+        })
       }
     },
     handleOk () {

src/views/activiti/task/MyTask.vue

@@ -46,6 +46,7 @@ import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPage } from '@/api/activiti/activiti'
+import { fetchSbScrapForm } from '@/api/sb/scraps'
 
 export default {
   name: 'TaskList',
@@ -154,7 +155,9 @@ export default {
     handleAudit (record) {
       this.visible = false
       if (record.targetCode === 'sb_info_scrap') {
-        this.$refs.detailAuditScrapModal.base(record)
+        fetchSbScrapForm({ id: record.targetId }).then(res => {
+          this.$refs.detailAuditScrapModal.base(record, res.data)
+        })
       }
     },
     handleChange (record) {

src/views/activiti/task/MyTaskFinish.vue

@@ -43,6 +43,7 @@ import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPageFinish } from '@/api/activiti/activiti'
+import { fetchSbScrapForm } from '@/api/sb/scraps'
 
 export default {
   name: 'TaskList',
@@ -151,7 +152,9 @@ export default {
     handleView (record) {
       this.visible = false
       if (record.targetCode === 'sb_info_scrap') {
-        this.$refs.detailAuditScrapModal.base(record)
+        fetchSbScrapForm({ id: record.targetId }).then(res => {
+          this.$refs.detailAuditScrapModal.base(record, res.data)
+        })
       }
     },
     handleOk () {

src/views/sb/info/SbInfo.vue

@@ -273,7 +273,8 @@ export default {
       // 查询参数
       queryParam: {
         filter: this.filter,
-        useType: this.useType
+        useType: this.useType,
+        id: this.$route.query.id
       },
       depreciationTypeMap: {},
       visible: true,

src/views/sb/scraps/SbScrapForm.vue

@@ -105,7 +105,6 @@
               title="再次提交该条数据？"
               @confirm="handleStart(record)">再次提交</operation-button>
             <operation-button
-              v-if="record.status != 3"
               :type="2"
               title="是否要终止审批？"
               @confirm="handleStop(record)">终止审批</operation-button>
@@ -183,16 +182,8 @@ export default {
         },
         {
           title: '申请人',
-          dataIndex: 'applyUserId'
-        },
-        {
-          title: '申请人名称',
           dataIndex: 'applyUserName'
         },
-        {
-          title: '创建人名称',
-          dataIndex: 'createdUserName'
-        },
         {
           title: '创建日期',
           dataIndex: 'createdTime'
@@ -335,6 +326,7 @@ export default {
     handleStart (record) {
       startSbInfoScrap({ id: record.id, processInstanceId: record.processInstanceId }).then(res => {
         this.$message.info(res.data)
+        this.handleEnter()
       })
     },
     handleViewImage (record) {
@@ -348,7 +340,7 @@ export default {
     handleStop (record) {
       this.$message.info('正在终止审批流程，请勿重复点击')
       this.confirmLoading = true
-      stopSbInfoScrapForAudit(record)
+      stopSbInfoScrapForAudit({ id: record.id, processInstanceId: record.processInstanceId })
         .then(() => {
           this.$message.info('已成功终止审批流程，可以重新发起审批')
           this.confirmLoading = false

src/views/sb/scraps/modules/Detail.vue

@@ -1,28 +1,26 @@
 <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 style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
-        </span>
-      </a-col>
-    </a-row>
-    <detail-list title="" :col="2">
-      <detail-list-item term="单号">{{ model.no }}</detail-list-item>
-      <detail-list-item term="设备Id"><a @click="sbIdhandleDetail">{{ model.sbId }}</a></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.reason }}</detail-list-item>
-      <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="状态">{{ BaseTool.Object.getField(this.statusMap,model.status) }}</detail-list-item>
-      <detail-list-item term="申请人">{{ model.applyUserId }}</detail-list-item>
-      <detail-list-item term="申请人名称">{{ model.applyUserName }}</detail-list-item>
-      <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-      <detail-list-item term="更新人">{{ model.updateUserId }}</detail-list-item>
-      <detail-list-item term="更新人名称">{{ model.updateUserName }}</detail-list-item>
-      <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-    </detail-list>
-    <history :target-id="model.id" :process-instance-id="model.processInstanceId" :ok="handleCancel"></history>
+  <a-card :bordered="false" class="card" :title="modalTitle">
+    <div v-show="visible">
+      <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="default" @click="handleCancel()">返回</a-button>
+          </span>
+        </a-col>
+      </a-row>
+      <detail-list title="" :col="2">
+        <detail-list-item term="单号">{{ model.no }}</detail-list-item>
+        <detail-list-item term="设备Id"><a @click="sbIdhandleDetail">{{ model.sbId }}</a></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.reason }}</detail-list-item>
+        <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
+        <detail-list-item term="状态">{{ BaseTool.Object.getField(this.statusMap,model.status) }}</detail-list-item>
+        <detail-list-item term="创建日期">{{ model.createdTime }}</detail-list-item>
+        <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
+      </detail-list>
+    </div>
+    <history :target-id="model.id" :process-instance-id="model.processInstanceId" :audit="false" :ok="handleCancel"></history>
   </a-card>
 </template>
 
@@ -47,6 +45,7 @@ export default {
       // 下拉框map
       statusMap: {},
       model: {
+        'id': null,
         'no': null,
         'sbId': null,
         'sbNo': null,
@@ -54,6 +53,7 @@ export default {
         'reason': null,
         'remark': null,
         'status': null,
+        'processInstanceId': null,
         'applyUserId': null,
         'applyUserName': null,
         'createdUserId': null,
@@ -65,7 +65,6 @@ export default {
   },
   created () {
     // 下拉框map
-
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.ACTIVITI_FORM_STATUS)
   },
   methods: {

src/views/sb/scraps/modules/DetailAudit.vue

@@ -16,13 +16,15 @@
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="状态">{{ BaseTool.Object.getField(this.statusMap,model.status) }}</detail-list-item>
       <detail-list-item term="申请人">{{ model.applyUserId }}</detail-list-item>
-      <detail-list-item term="申请人名称">{{ model.applyUserName }}</detail-list-item>
-      <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
-      <detail-list-item term="更新人">{{ model.updateUserId }}</detail-list-item>
-      <detail-list-item term="更新人名称">{{ model.updateUserName }}</detail-list-item>
+      <detail-list-item term="创建日期">{{ model.createdTime }}</detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
     </detail-list>
-    <history :audit="audit" :target-id="task.targetId" :process-instance-id="task.processInstanceId" :task-id="task.taskId" :ok="handleCancel"></history>
+    <history
+      :audit="audit"
+      :target-id="task.targetId"
+      :process-instance-id="task.processInstanceId"
+      :task-id="task.taskId"
+      :ok="handleCancel"></history>
   </a-card>
 </template>
 
@@ -53,9 +55,8 @@ export default {
       visible: false,
       // 下拉框map
       statusMap: {},
-      task: null,
-      model: {
-        'no': null,
+      task: {},
+      model: {'no': null,
         'sbId': null,
         'sbNo': null,
         'sbName': null,
@@ -77,13 +78,13 @@ export default {
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.ACTIVITI_FORM_STATUS)
   },
   methods: {
-    base (record) {
+    base (record, model) {
+      console.log(record)
+      console.log(model)
       this.visible = true
       this.modalTitle = '详情'
       this.task = record
-      fetchSbScrapForm({ id: record.targetId }).then(res => {
-        this.model = res.data
-      })
+      this.model = model
     },
     handleCancel () {
       this.visible = false

src/views/sqarepartmanage/sparepartinfo/modules/BaseForm.vue

@@ -594,7 +594,7 @@ export default {
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
         this.modalTitle = '添加'
-        /*this.isAdd = true*/
+        /* this.isAdd = true */
         this.$refs.imageUpload.base(1, [])
         return
       }
@@ -744,7 +744,7 @@ export default {
       this.unitName = null
       this.unitNameBz = null
       this.gg = null
-      /*this.isAdd = true*/
+      /* this.isAdd = true */
       this.data = []
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok', values)