guarantee-lsq 2 gadi atpakaļ
vecāks
revīzija
642d012f02
2 mainītis faili ar 51 papildinājumiem un 12 dzēšanām
  1. 20 9
      src/api/activiti/activiti.js
  2. 31 3
      src/views/activiti/task/MyTaskFinish.vue

+ 20 - 9
src/api/activiti/activiti.js

@@ -7,7 +7,7 @@ import { stringify } from 'qs'
  * @param parameter
  * @returns {*}
  */
-export function getTaskPage (parameter) {
+export function getTaskPage(parameter) {
   return axios({
     url: '/act/my-task/page?' + stringify(parameter),
     method: 'get',
@@ -23,7 +23,7 @@ export function getTaskPage (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getTaskPageClaim (parameter) {
+export function getTaskPageClaim(parameter) {
   return axios({
     url: '/act/my-task/claim/page?' + stringify(parameter),
     method: 'get',
@@ -39,7 +39,7 @@ export function getTaskPageClaim (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getTaskPageFinish (parameter) {
+export function getTaskPageFinish(parameter) {
   return axios({
     url: '/act/my-task/finish/page?' + stringify(parameter),
     method: 'get',
@@ -49,13 +49,23 @@ export function getTaskPageFinish (parameter) {
   })
 }
 
+export function getLocalTaskPageFinish (parameter) {
+  return axios({
+    url: '/audit/audits/page?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * page func
  * parameter: { }
  * @param parameter
  * @returns {*}
  */
-export function getTaskPageStart (parameter) {
+export function getTaskPageStart(parameter) {
   return axios({
     url: '/act/my-task/start/page?' + stringify(parameter),
     method: 'get',
@@ -71,7 +81,7 @@ export function getTaskPageStart (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function audit (parameter) {
+export function audit(parameter) {
   return axios({
     url: '/act/audit',
     method: 'POST',
@@ -89,7 +99,7 @@ export function audit (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getAuditRecord (processInstanceId) {
+export function getAuditRecord(processInstanceId) {
   return axios({
     url: '/act/audit/history/' + processInstanceId,
     method: 'get',
@@ -98,13 +108,14 @@ export function getAuditRecord (processInstanceId) {
     }
   })
 }
+
 /**
  * getShineProImage func
  * parameter: { }
  * @param parameter
  * @returns {*}
  */
-export function getShineProDefImage (processInstanceId) {
+export function getShineProDefImage(processInstanceId) {
   return axios({
     url: '/act/shine-procDef-image/' + processInstanceId,
     method: 'get',
@@ -120,7 +131,7 @@ export function getShineProDefImage (processInstanceId) {
  * @param parameter
  * @returns {*}
  */
-export function getShineProDefXml (parameter) {
+export function getShineProDefXml(parameter) {
   return axios({
     url: '/act/shine-procDef-xml/' + parameter.id,
     method: 'get',
@@ -137,7 +148,7 @@ export function getShineProDefXml (parameter) {
  * @param parameter
  * @returns {*}
  */
-export function getShineProImage (processInstanceId) {
+export function getShineProImage(processInstanceId) {
   return axios({
     url: '/act/shine-proc-image/' + processInstanceId,
     method: 'get',

+ 31 - 3
src/views/activiti/task/MyTaskFinish.vue

@@ -42,7 +42,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 { getTaskPageFinish, getLocalTaskPageFinish } from '@/api/activiti/activiti'
 import { fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
 
 export default {
@@ -65,6 +65,8 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
+          checked: true,
+          width: 80,
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
@@ -72,46 +74,72 @@ export default {
         {
           title: '类型',
           dataIndex: 'targetCode',
+          checked: true,
+          width: 150,
           customRender: (text, record, index) => {
             return this.DictCache.VALUE.SB_INFO_AUDIT_MODEL_NAME[text]
           }
         },
         {
           title: '任务名称',
+          checked: true,
+          width: 150,
           dataIndex: 'targetName'
         },
         {
           title: '单号',
+          checked: true,
+          width: 180,
           dataIndex: 'no'
         },
         {
           title: '申请人',
+          checked: true,
+          width: 120,
           dataIndex: 'userName'
         },
         {
           title: '创建时间',
+          checked: true,
+          width: 150,
           dataIndex: 'applyTime'
         },
+        {
+          title: '审批时间',
+          checked: true,
+          width: 150,
+          dataIndex: 'createTime'
+        },
+        {
+          title: '审批意见',
+          checked: true,
+          width: 150,
+          dataIndex: 'opinion'
+        },
         {
           title: '状态',
+          checked: true,
+          width: 100,
           dataIndex: 'status',
+          fixed: 'right',
           customRender: (text, record, index) => {
             return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
               this.DictCache.COLOR.SB_ALLOCATE_APPLY_STATUS, this.statusMap)
           }
-
         },
         {
           title: '操作',
           key: 'action',
           width: '220px',
+          checked: true,
+          fixed: 'right',
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getTaskPageFinish(Object.assign(parameter, this.queryParam))
+        return getLocalTaskPageFinish(Object.assign(parameter, this.queryParam))
           .then(res => {
             return res.data
           })