审批优化

src/views/activiti/task/MyTaskFinish.vue

@@ -25,6 +25,7 @@
         rowKey="id"
         :columns="columns"
         :data="loadData"
+        :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
         showPagination="auto"
       >
         <span slot="action" slot-scope="record">
@@ -42,8 +43,9 @@
 import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
-import { getTaskPageFinish, getLocalTaskPageFinish } from '@/api/activiti/activiti'
+import { getLocalTaskPageFinish } from '@/api/activiti/activiti'
 import { fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
+import { fetchOutStoreForm } from '@/api/store/outstoreform'
 
 export default {
   name: 'TaskList',
@@ -75,7 +77,7 @@ export default {
           title: '类型',
           dataIndex: 'targetCode',
           checked: true,
-          width: 150,
+          width: 120,
           customRender: (text, record, index) => {
             return this.DictCache.VALUE.SB_INFO_AUDIT_MODEL_NAME[text]
           }
@@ -83,7 +85,7 @@ export default {
         {
           title: '任务名称',
           checked: true,
-          width: 150,
+          width: 120,
           dataIndex: 'targetName'
         },
         {
@@ -113,7 +115,7 @@ export default {
         {
           title: '审批意见',
           checked: true,
-          width: 150,
+          width: 120,
           dataIndex: 'opinion'
         },
         {
@@ -190,12 +192,22 @@ export default {
     },
     handleView (record) {
       this.visible = false
-      fetchCustomFieldTemplateVOData({ id: record.targetId }).then(res => {
-        const templateData = JSON.parse(res.data.data)
-        const recordTemp = res.data
-        recordTemp.taskId = record.taskId
-        this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
-      })
+      if (record.targetCode === 'out_store_back') { // 仓库审批跳转到仓库审批页面
+        fetchOutStoreForm({ id: record.targetId }).then(res => {
+          const templateData = res.data
+          const recordTemp = res.data
+          recordTemp.taskId = record.taskId
+          recordTemp.remark = record.targetCode
+          this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
+        })
+      } else {
+        fetchCustomFieldTemplateVOData({ id: record.targetId }).then(res => {
+          const templateData = JSON.parse(res.data.data)
+          const recordTemp = res.data
+          recordTemp.taskId = record.taskId
+          this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
+        })
+      }
       /* fetchCustomFieldTemplateData({ id: record.targetId }).then(res => {
         const templateData = JSON.parse(res.data.data)
         this.$refs.detailAuditScrapModal.base(record, templateData)