完善

src/api/activiti/activiti.js

@@ -49,6 +49,22 @@ export function getTaskPageFinish (parameter) {
   })
 }
 
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getTaskPageStart (parameter) {
+  return axios({
+    url: '/act/my-task/start/page?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * 审批 func
  * parameter: { }

src/views/activiti/task/MyStart.vue

@@ -29,35 +29,26 @@
       >
         <span slot="action" slot-scope="record">
           <template>
-            <a @click="handleAudit(record)">审批</a>
-            <a-divider type="vertical" />
-            <a @click="handleChange(record)">转签</a>
+            <a @click="handleView(record)">查看</a>
           </template>
         </span>
       </s-table>
     </div>
-    <audit ref="auditModal" @ok="handleOk"/>
-    <suplier-audit-form ref="supplierAuditModal" @ok="handleOk"/>
-    <detail-audit-scrap ref="detailAuditScrapModal" @ok="handleOk"/>
-    <assign-form ref="assignForm" @ok="handleOk"/>
+    <detail-audit-scrap :audit="false" ref="detailAuditScrapModal" @ok="handleOk"/>
   </a-card>
 </template>
 
 <script>
 import { STable, Ellipsis } from '@/components'
-import Audit from '../audit/Audit'
 import AssignForm from './modules/AssignForm'
-import SuplierAuditForm from '@/views/purchase/supplier/modules/AuditForm'
-import DetailAuditScrap from '@/views/sb/scrap/modules/DetailAuditScrap'
-import { getTaskPage } from '@/api/activiti/activiti'
+import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
+import { getTaskPageStart } from '@/api/activiti/activiti'
 
 export default {
   name: 'TaskList',
   components: {
     STable,
     Ellipsis,
-    SuplierAuditForm,
-    Audit,
     DetailAuditScrap,
     AssignForm
   },
@@ -109,7 +100,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getTaskPage(Object.assign(parameter, this.queryParam))
+        return getTaskPageStart(Object.assign(parameter, this.queryParam))
           .then(res => {
             return res.data
           })
@@ -157,29 +148,11 @@ export default {
         this.optionAlertShow = false
       }
     },
-    handleAudit (record) {
+    handleView (record) {
       this.visible = false
-      if (record.targetCode === 'purchase_plan') {
-        this.$refs.purchasePlanAuditModal.base(record)
-      } else if (record.targetCode === 'purchase_apply') {
-        this.$refs.purchaseApplyAuditModal.base(record)
-      } else if (record.targetCode === 'purchase_demand_plan') {
-        this.$refs.purchaseDemandPlanAuditModal.base(record)
-      } else if (record.targetCode === 'purchase_demand_plan_add') {
-        this.$refs.purchaseDemandPlanAuditAddModal.base(record)
-      } else if (record.targetCode === 'purchase_bid') {
-        this.$refs.purchaseBidAuditAddModal.base(record)
-      } else if (record.targetCode === 'supplier') {
-        this.$refs.supplierAuditModal.base(record)
-      } else if (record.targetCode === 'sb_info_scrap' || record.targetCode === '设备报废审批') {
+      if (record.targetCode === 'sb_info_scrap') {
         this.$refs.detailAuditScrapModal.base(record)
-      } else if (record.targetCode === 'sb_info_scrap_second') {
-        this.$refs.detailAuditScrapSecondModal.base(record)
       }
-      // this.$refs.auditModal.base(record)
-    },
-    handleChange (record) {
-      this.$refs.assignForm.base(record)
     },
     handleOk () {
       this.visible = true

src/views/activiti/task/MyTask.vue

@@ -36,7 +36,6 @@
         </span>
       </s-table>
     </div>
-    <suplier-audit-form ref="supplierAuditModal" @ok="handleOk"/>
     <detail-audit-scrap ref="detailAuditScrapModal" @ok="handleOk"/>
     <assign-form ref="assignForm" @ok="handleOk"/>
   </a-card>
@@ -45,7 +44,6 @@
 <script>
 import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
-import SuplierAuditForm from '@/views/purchase/supplier/modules/AuditForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPage } from '@/api/activiti/activiti'
 
@@ -54,8 +52,6 @@ export default {
   components: {
     STable,
     Ellipsis,
-    SuplierAuditForm,
-    Audit,
     DetailAuditScrap,
     AssignForm
   },

src/views/activiti/task/MyTaskClaim.vue

@@ -34,7 +34,6 @@
         </span>
       </s-table>
     </div>
-    <suplier-audit-form ref="supplierAuditModal" @ok="handleOk"/>
     <detail-audit-scrap ref="detailAuditScrapModal" @ok="handleOk"/>
   </a-card>
 </template>
@@ -42,7 +41,6 @@
 <script>
 import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
-import SuplierAuditForm from '@/views/purchase/supplier/modules/AuditForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPageClaim } from '@/api/activiti/activiti'
 import { claimSbInfoScrapForAudit } from '@/api/activiti/activiti-sb-scrap'
@@ -52,8 +50,6 @@ export default {
   components: {
     STable,
     Ellipsis,
-    SuplierAuditForm,
-    Audit,
     DetailAuditScrap,
     AssignForm
   },

src/views/activiti/task/MyTaskFinish.vue

@@ -29,21 +29,18 @@
       >
         <span slot="action" slot-scope="record">
           <template>
-            <a @click="handleAudit(record)">查看</a>
+            <a @click="handleView(record)">查看</a>
           </template>
         </span>
       </s-table>
     </div>
-    <suplier-audit-form ref="supplierAuditModal" @ok="handleOk"/>
     <detail-audit-scrap :audit="false" ref="detailAuditScrapModal" @ok="handleOk"/>
   </a-card>
 </template>
 
 <script>
 import { STable, Ellipsis } from '@/components'
-import Audit from '../audit/Audit'
 import AssignForm from './modules/AssignForm'
-import SuplierAuditForm from '@/views/purchase/supplier/modules/AuditForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPageFinish } from '@/api/activiti/activiti'
 
@@ -52,8 +49,6 @@ export default {
   components: {
     STable,
     Ellipsis,
-    SuplierAuditForm,
-    Audit,
     DetailAuditScrap,
     AssignForm
   },
@@ -153,7 +148,7 @@ export default {
         this.optionAlertShow = false
       }
     },
-    handleAudit (record) {
+    handleView (record) {
       this.visible = false
       if (record.targetCode === 'sb_info_scrap') {
         this.$refs.detailAuditScrapModal.base(record)

src/views/sb/scraps/SbScrapForm.vue

@@ -98,17 +98,17 @@
               v-if="record.status == 1"
               :type="2"
               title="确认提交该条数据？"
-              @click="handleStart(record.id)">提交</operation-button>
+              @confirm="handleStart(record)">提交</operation-button>
             <operation-button
               v-if="record.status == 4"
               :type="2"
               title="再次提交该条数据？"
-              @click="handleStart(record)">再次提交</operation-button>
+              @confirm="handleStart(record)">再次提交</operation-button>
             <operation-button
               v-if="record.status != 3"
               :type="2"
               title="是否要终止审批？"
-              @click="handleStop(record)">终止审批</operation-button>
+              @confirm="handleStop(record)">终止审批</operation-button>
           </template>
         </span>
       </s-table>
@@ -333,7 +333,7 @@ export default {
       })
     },
     handleStart (record) {
-      startSbInfoScrap(record).then(res => {
+      startSbInfoScrap({ id: record.id, processInstanceId: record.processInstanceId }).then(res => {
         this.$message.info(res.data)
       })
     },