YangZhiJie 2 роки тому
батько
коміт
d63aa6306f

+ 0 - 283
src/api/workflow/WorkflowResource.js

@@ -294,42 +294,6 @@ export default {
     });
   },
 
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询流程的第一个taskInfo 
-	 */
-  getTaskInfo: function(processInstanceId){
-    var requestUrl = 'api/WorkflowResource/getTaskInfo';
-    var paramCount = 0;
-    if(processInstanceId != null){
-      requestUrl += (paramCount > 0) ? '&' : '?';
-      requestUrl += ('processInstanceId=' + processInstanceId);
-      paramCount ++;
-    }
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'get',
-        contentType: 'application/json',
-				
-				
-				
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
 
   /**
 	 * 工具类自动生成的方法
@@ -485,99 +449,6 @@ export default {
 				
 				
 				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询看板待审批的任务信息 
-	 */
-  queryAllNeedApproveTask: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/queryAllNeedApproveTask';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 获取所有审批类型的工作流 
-	 */
-  queryApproveTypeWorkflow: function(){
-    var requestUrl = 'api/WorkflowResource/ApproveType';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'get',
-        contentType: 'application/json',
-				
-				
-				
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询已审批的任务信息 
-	 */
-  queryApprovedTask: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/Approved';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
         beforeSend: function(request) {
           Common.addTokenToRequest(request);
         },
@@ -622,160 +493,6 @@ export default {
     });
   },
 
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询抄送任务 
-	 */
-  queryCopyTaks: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/CopyTask';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询我发起的审批 
-	 */
-  queryMyApplyProcessInfo: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/MyApply';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询待审批的任务信息 
-	 */
-  queryNeedApproveTask: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/NeedApprove';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询已拒绝的审批 
-	 */
-  queryNotApprovedTask: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/Refuse';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询看板待审批的任务信息 
-	 */
-  queryTaskInfos: function(taskQueryParam){
-    var requestUrl = 'api/WorkflowResource/queryTaskInfos';
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'post',
-        contentType: 'application/json',
-				
-				
-        data: JSON.stringify(taskQueryParam),
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
 
   /**
 	 * 工具类自动生成的方法

+ 6 - 0
src/workflow/ActivitiAdmin.vue

@@ -17,6 +17,7 @@
     <a-upload
       v-model:file-list="fileList"
       name="files"
+      :headers="headers"
       action="/api/modelResource/createModelByFile"
       @change="handleChange"
     >
@@ -313,6 +314,10 @@ export default defineComponent({
     };
 
     const fileList = ref([]);
+
+    const headers = {
+      'token': localStorage.getItem('#token'),
+    };
     
     return {
       searchInput,
@@ -336,6 +341,7 @@ export default defineComponent({
       onSelectChange,
       deleteBpmnModalVisible,
       downloadBpmns,
+      headers,
     };
   },
 });

+ 11 - 0
src/workflow/ApproveComment.vue

@@ -214,6 +214,17 @@
                 <h5 class="m-h5">{{ activeTask.startTime }}</h5>
                 <p class="comment-text">{{ $t("lang.approveComment.processing") }}</p>
 
+
+                <div v-if="activeTask.comments != undefined">
+                  <div
+                    v-for="commentItem in activeTask.comments"
+                    :key="commentItem.id"
+                  >
+                    <h5 class="m-h5">{{ commentItem.time }}</h5>
+                    <p class="comment-text">{{ commentItem.message }}</p>
+                  </div>
+                </div>
+                
                 <ApproveTaskAttachmentView :enable-delete="activeTask.id == taskInfoId" :attachments="activeTask.attachments" />
               </div>
             </li>

+ 3 - 3
src/workflow/ApprovedWorkflow.vue

@@ -266,7 +266,7 @@ export default {
       };
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/ApproveType'),
+        url: Common.getApiURL('WorkflowResource/approveType'),
         type: 'GET',
         dataType: 'json',
         beforeSend: function (request) {
@@ -341,7 +341,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/Approved'),
+        url: Common.getApiURL('WorkflowResource/approved'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',
@@ -426,7 +426,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/Approved'),
+        url: Common.getApiURL('WorkflowResource/approved'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',

+ 3 - 3
src/workflow/CopyTaskWorkflow.vue

@@ -247,7 +247,7 @@ export default {
       };
 
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/ApproveType'),
+        url: Common.getApiURL('WorkflowResource/approveType'),
         type: 'GET',
         dataType: 'json',
         beforeSend: function (request) {
@@ -325,7 +325,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/CopyTask'),
+        url: Common.getApiURL('WorkflowResource/copyTask'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',
@@ -421,7 +421,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/CopyTask'),
+        url: Common.getApiURL('WorkflowResource/copyTask'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',

+ 3 - 3
src/workflow/MyApplyWorkflow.vue

@@ -249,7 +249,7 @@ export default {
       };
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/ApproveType'),
+        url: Common.getApiURL('WorkflowResource/approveType'),
         type: 'GET',
         dataType: 'json',
         beforeSend: function (request) {
@@ -323,7 +323,7 @@ export default {
       }
 						
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/MyApply'),
+        url: Common.getApiURL('WorkflowResource/myApply'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',
@@ -405,7 +405,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/MyApply'),
+        url: Common.getApiURL('WorkflowResource/myApply'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',

+ 56 - 74
src/workflow/NeedApproveWorkflow.vue

@@ -4,7 +4,7 @@
       <div class="row m-row">
         <div class="col-md-12 col-sm-12 col-xs-12">
           <input
-            v-model="taskQueryParam.condition"
+            v-model="needApproveRequest.condition"
             autocomplete="off"
             type="text"
             :placeholder="$t('lang.NeedApproveWorkflow.describe1')"
@@ -14,7 +14,7 @@
       </div>
 
       <div
-        v-if="taskQueryParam.advancedQuery"
+        v-if="needApproveRequest.advancedQuery"
         class="row m-row"
       >
         <div class="col-md-2 col-sm-2 col-xs-4">
@@ -23,19 +23,19 @@
 
         <div class="col-md-5 col-sm-5 col-xs-4">
           <DateTime
-            v-model="startAfter"
+            v-model="needApproveRequest.processInstanceStartAfter"
           />
         </div>
 
         <div class="col-md-5 col-sm-5 col-xs-4">
           <DateTime
-            v-model="startBefore"
+            v-model="needApproveRequest.processInstanceStartBefore"
           />
         </div>
       </div>
 
       <div
-        v-if="taskQueryParam.advancedQuery"
+        v-if="needApproveRequest.advancedQuery"
         class="row m-row"
       >
         <div class="col-md-2 col-sm-2 col-xs-4">
@@ -57,19 +57,7 @@
           <label class="form-control-static">{{ $t("lang.NeedApproveWorkflow.subject") }}</label>
         </div>
         <div class="col-md-10 col-sm-10 col-xs-8">
-          <select
-            v-model="deploymentId"
-            class="form-control"
-          >
-            <option value="">{{ $t("lang.NeedApproveWorkflow.all") }}</option>
-            <option
-              v-for="item in approveType"
-              :key="item.deploymentId"
-              :value="item.deploymentId"
-            >
-              {{ item.name }}
-            </option>
-          </select>
+          <WorkflowType v-model="needApproveRequest.windowNo" />
         </div>
       </div>
 
@@ -85,8 +73,8 @@
           </button>
           <a
             class="form-label"
-            @click="taskQueryParam.advancedQuery = !taskQueryParam.advancedQuery"
-          >{{ (taskQueryParam.advancedQuery) ? $t("lang.NeedApproveWorkflow.closeAdvancedSearch") : $t("lang.NeedApproveWorkflow.advancedSearch") }}</a>
+            @click="needApproveRequest.advancedQuery = !needApproveRequest.advancedQuery"
+          >{{ (needApproveRequest.advancedQuery) ? $t("lang.NeedApproveWorkflow.closeAdvancedSearch") : $t("lang.NeedApproveWorkflow.advancedSearch") }}</a>
           <a
             id="clearSearchCondition"
             class="form-label"
@@ -166,11 +154,12 @@ import CustomerTask from './CustomerTask.vue';
 import { Notify, Uuid } from 'pc-component-v3';
 import TaskOpenUtil from './TaskOpenUtil.js';
 import * as dayjs from 'dayjs';
+import WorkflowType from './WorkflowType.vue';
 
 export default {
 
   components: {
-    CustomerTask,
+    CustomerTask, WorkflowType,
   },
   data: function () {
     return {
@@ -178,10 +167,21 @@ export default {
       'defaultStartBefore': '',  //默认结束日期
       'startAfter': '',          //开始日期
       'startBefore': '',         //结束日期
-      'taskQueryParam': { 'processStatusQuery': 'RUNNING' },     	//查询条件       
+      'needApproveRequest': { 
+        'condition': null,
+        'windowNo': null,
+        'startUserId': null,
+        'processInstanceStartAfter': null,
+        'processInstanceStartBefore': null,
+        'taskCreateTimeAfter': null,
+        'taskCreateTimeBefore': null,
+        'start': 0,
+        'length': 10,
+      },
+
       'taskInfos': [],
       'userName': '',
-      'deploymentId': '',
+      'windowNo': '',
       'approveType': [],
       pagination: {
         total: 0,
@@ -202,41 +202,23 @@ export default {
     // 加载数据
     init: function () {
       var _self = this;
-      _self.loading=true;
       _self.defaultStartAfter = dayjs().add(-1, 'month').format('YYYY-MM-DD HH:mm:ss');
       _self.defaultStartBefore = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      _self.taskQueryParam = {
+      _self.needApproveRequest = {
         'condition': '',         //查询条件(主题、文件编码、正文内容、审批意见).
         'startAfter': _self.defaultStartAfter,
         'startBefore': _self.defaultStartBefore,
         'advancedQuery': false,    //是否高级查询
         //"startUserId" : "",     //审批单发起人
-        'deploymentId': '',      //工作流部署Id
+        'windowNo': '',      //工作流部署Id
         'processStatusQuery': 'RUNNING',  //审批状态
         'range': {               //查询区间
           'length': 100,
           'start': 0,
         },
       };
-      console.log(JSON.stringify(_self.taskQueryParam));
+      console.log(JSON.stringify(_self.needApproveRequest));
 
-      $.ajax({
-        url: Common.getApiURL('WorkflowResource/ApproveType'),
-        type: 'GET',
-        dataType: 'json',
-        beforeSend: function (request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function (data) {
-          _self.loading=false;
-          _self.approveType = data;
-          _self.search();
-        },
-        error: function (XMLHttpRequest, textStatus, errorThrown) {
-          _self.loading=false;
-          Common.processException(XMLHttpRequest, textStatus, errorThrown);
-        },
-      });
     },
 
 
@@ -246,23 +228,23 @@ export default {
       _self.loading=true;
 
       _self.pagination.current_page = 1;
-      _self.taskQueryParam.range.start = 0;
-      _self.taskQueryParam.range.length = _self.pagination.per_page;
-      if (_self.taskQueryParam.advancedQuery) {
+      _self.needApproveRequest.range.start = 0;
+      _self.needApproveRequest.range.length = _self.pagination.per_page;
+      if (_self.needApproveRequest.advancedQuery) {
         _self.getStartUserId();
-        _self.taskQueryParam.startAfter = _self.startAfter;
-        _self.taskQueryParam.startBefore = _self.startBefore;
+        _self.needApproveRequest.startAfter = _self.startAfter;
+        _self.needApproveRequest.startBefore = _self.startBefore;
       }
-      _self.taskQueryParam.deploymentId = _self.deploymentId;
+      _self.needApproveRequest.windowNo = _self.windowNo;
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/NeedApprove'),
+        url: Common.getApiURL('WorkflowResource/needApprove'),
         type: 'post',
         dataType: 'json',
         beforeSend: function (request) {
           Common.addTokenToRequest(request);
         },
         contentType: 'application/json',
-        data: JSON.stringify(_self.taskQueryParam),
+        data: JSON.stringify(_self.needApproveRequest),
         success: function (data) {
           _self.loading=false;
           _self.taskInfos = data;
@@ -284,7 +266,7 @@ export default {
             }
           });
           _self.pagination.total = data.totalCount;
-          _self.pagination.last_page = Math.ceil(data.totalCount / _self.taskQueryParam.range.length);
+          _self.pagination.last_page = Math.ceil(data.totalCount / _self.needApproveRequest.range.length);
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           _self.loading=false;
@@ -320,9 +302,9 @@ export default {
           async: false,
           success: function (data) {
             _self.loading=false;
-            _self.taskQueryParam.startUserId = '';
+            _self.needApproveRequest.startUserId = '';
             if (data.dataList[0].id != null) {
-              _self.taskQueryParam.startUserId = data.dataList[0].id;
+              _self.needApproveRequest.startUserId = data.dataList[0].id;
             }
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -336,11 +318,11 @@ export default {
     //是否开启高级查询
     isAdvancedQuery: function (flag) {
       let _self = this;
-      _self.taskQueryParam.advancedQuery = flag;
+      _self.needApproveRequest.advancedQuery = flag;
       if (!flag) {
         //初始化日期
-        _self.taskQueryParam.startAfter = _self.defaultStartAfter;
-        _self.taskQueryParam.startBefore = _self.defaultStartBefore;
+        _self.needApproveRequest.startAfter = _self.defaultStartAfter;
+        _self.needApproveRequest.startBefore = _self.defaultStartBefore;
 
       }
     },
@@ -348,7 +330,7 @@ export default {
     clean: function () {   //清空搜索条件
       var _self = this;
       _self.userName = '';
-      _self.taskQueryParam.condition = '';
+      _self.needApproveRequest.condition = '';
       _self.defaultStartAfter = dayjs().add(-1, 'month').format('YYYY-MM-DD HH:mm:ss');
       _self.defaultStartBefore = dayjs().format('YYYY-MM-DD HH:mm:ss');
       _self.startAfter = '';
@@ -357,28 +339,28 @@ export default {
     changePage: function () {
       var _self = this;
       _self.loading=true;
-      _self.taskQueryParam.range.start = (_self.pagination.current_page - 1) * _self.pagination.per_page;
-      _self.taskQueryParam.range.length = _self.pagination.per_page;
-      _self.taskQueryParam.startAfter = _self.defaultStartAfter;
-      _self.taskQueryParam.startBefore = _self.defaultStartBefore;
-      _self.taskQueryParam.finishAfter = _self.defaultFinishAfter;
-      _self.taskQueryParam.finishBefore = _self.defaultFinishBefore;
-      if (_self.taskQueryParam.advancedQuery) {
-        _self.taskQueryParam.startAfter = _self.startAfter;
-        _self.taskQueryParam.startBefore = _self.startBefore;
-        _self.taskQueryParam.finishAfter = _self.finishAfter;
-        _self.taskQueryParam.finishBefore = _self.finishBefore;
+      _self.needApproveRequest.range.start = (_self.pagination.current_page - 1) * _self.pagination.per_page;
+      _self.needApproveRequest.range.length = _self.pagination.per_page;
+      _self.needApproveRequest.startAfter = _self.defaultStartAfter;
+      _self.needApproveRequest.startBefore = _self.defaultStartBefore;
+      _self.needApproveRequest.finishAfter = _self.defaultFinishAfter;
+      _self.needApproveRequest.finishBefore = _self.defaultFinishBefore;
+      if (_self.needApproveRequest.advancedQuery) {
+        _self.needApproveRequest.startAfter = _self.startAfter;
+        _self.needApproveRequest.startBefore = _self.startBefore;
+        _self.needApproveRequest.finishAfter = _self.finishAfter;
+        _self.needApproveRequest.finishBefore = _self.finishBefore;
       }
-      console.log(JSON.stringify(_self.taskQueryParam));
+      console.log(JSON.stringify(_self.needApproveRequest));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/NeedApprove'),
+        url: Common.getApiURL('WorkflowResource/needApprove'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',
         beforeSend: function (request) {
           Common.addTokenToRequest(request);
         },
-        data: JSON.stringify(_self.taskQueryParam),
+        data: JSON.stringify(_self.needApproveRequest),
         success: function (data) {
           _self.loading=false;
           _self.taskInfos = data;
@@ -400,7 +382,7 @@ export default {
 
           });
           _self.pagination.total = data.totalCount;
-          _self.pagination.last_page = Math.ceil(data.totalCount / _self.taskQueryParam.range.length);
+          _self.pagination.last_page = Math.ceil(data.totalCount / _self.needApproveRequest.range.length);
           console.log('totalCount=' + _self.pagination.total);
           console.log('totalPage=' + _self.pagination.last_page);
         },

+ 3 - 3
src/workflow/NotApproveWorkflow.vue

@@ -248,7 +248,7 @@ export default {
       };
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/ApproveType'),
+        url: Common.getApiURL('WorkflowResource/approveType'),
         type: 'GET',
         dataType: 'json',
         beforeSend: function (request) {
@@ -323,7 +323,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/Refuse'),
+        url: Common.getApiURL('WorkflowResource/refuse'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',
@@ -406,7 +406,7 @@ export default {
       }
       console.log(JSON.stringify(_self.taskQueryParam));
       $.ajax({
-        url: Common.getApiURL('WorkflowResource/Refuse'),
+        url: Common.getApiURL('WorkflowResource/refuse'),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',

+ 49 - 0
src/workflow/WorkflowType.vue

@@ -0,0 +1,49 @@
+<template>
+  <a-select
+    v-model:value="value"
+    show-search
+    :placeholder="$t('lang.NeedApproveWorkflow.all')"
+    style="width: 200px"
+    :options="approveTypes"
+    :field-names="{ label: 'windowName', value: 'windwowNo'}"
+    :filter-option="filterOption"
+  />
+</template>
+<script setup>
+
+
+import { ref, defineModel } from 'vue';
+import Common from '../common/Common.js';
+import { message } from 'ant-design-vue';
+
+const model = defineModel();
+const approveTypes = ref([]);
+
+// 加载工作流类型
+const loadWorkflowTypes = () => {
+  $.ajax({
+    url: Common.getApiURL('WorkflowResource/approveType'),
+    type: 'GET',
+    dataType: 'json',
+    beforeSend: function (request) {
+      Common.addTokenToRequest(request);
+    },
+    success: function (data) {
+      if (data.errorCode == 0) {
+        approveTypes.value = data.datas;
+      } else {
+        message.error(data.errorMessage);
+      }
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      Common.processException(XMLHttpRequest, textStatus, errorThrown);
+    },
+  });
+};
+
+loadWorkflowTypes();
+
+const filterOption = (input, option) => {
+  return option.windowName.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+</script>