完善

src/api/sb/info.js

@@ -502,3 +502,17 @@ export function historySbInfoScrapForAudit (parameter) {
     data: parameter
   })
 }
+
+/**
+ * update func 审批开始
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function changeSbInfoScrapForAudit (parameter) {
+  return axios({
+    url: '/activiti/sb/assign',
+    method: 'PUT',
+    data: parameter
+  })
+}

src/views/activiti/task/MyTask.vue

@@ -30,6 +30,8 @@
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleAudit(record)">审批</a>
+            <a-divider type="vertical" />
+            <a @click="handleChange(record)">转签</a>
           </template>
         </span>
       </s-table>
@@ -37,12 +39,14 @@
     <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"/>
   </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'
@@ -54,7 +58,8 @@ export default {
     Ellipsis,
     SuplierAuditForm,
     Audit,
-    DetailAuditScrap
+    DetailAuditScrap,
+    AssignForm
   },
   data () {
     return {
@@ -63,7 +68,6 @@ export default {
       queryParam: {
       },
       // 表头
-
       columns: [
         {
           title: '序号',
@@ -77,9 +81,9 @@ export default {
           dataIndex: 'targetCode',
           customRender: (text, record, index) => {
             if (text === 'supplier') {
-              return '供应商'
-            } else if (text === 'sb_info_scrap') {
-              return '设备报废'
+              return '供应商审批'
+            } else if (text === 'sb_info_scrap' || text === '设备报废审批') {
+              return '设备报废审批'
             }
           }
         },
@@ -174,6 +178,9 @@ export default {
       }
       // this.$refs.auditModal.base(record)
     },
+    handleChange (record) {
+      this.$refs.assignForm.base(record)
+    },
     handleOk () {
       this.visible = true
       this.$refs.table.refresh()

src/views/activiti/task/modules/AssignForm.vue

@@ -0,0 +1,103 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <a-form :form="form">
+      <row-list :col="2">
+        <row-item>
+          <a-form-item
+            label="转签人"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['changeUser', {rules: [{required: true, message: '转签人不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="item in userList"
+                :key="item.userId"
+                :label="item.realName"
+                :value="item.userId">{{ item.realName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
+      </row-list>
+    </a-form>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { queryUser } from '@/api/upms/user'
+import { changeSbInfoScrapForAudit } from '@/api/sb/info'
+
+export default {
+  name: 'DispatchBaseForm',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      // 下拉框map
+      sourceMap: {},
+      levelMap: {},
+      statusMap: {},
+      record: {},
+      userList: []
+    }
+  },
+  props: {
+  },
+  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.getUsers()
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      // 如果是空标识添加
+      this.modalTitle = '派工'
+      this.record = record
+    },
+    getUsers () {
+      queryUser({ status: 1 }).then(res => {
+        this.userList = res.data
+      })
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        values.taskId = this.record.taskId
+        changeSbInfoScrapForAudit(values)
+          .then(() => {
+            this.handleCancel(values)
+          }).catch(() => {
+            this.confirmLoading = false
+          })
+      })
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.confirmLoading = false
+      this.form.resetFields()
+      if (this.BaseTool.Object.isNotBlank(values)) {
+        this.$emit('ok')
+      }
+    }
+  }
+}
+</script>