sasp-flow-render 1.0.12 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/flowInst/flowInstList.vue +16 -13
  3. package/src/components/flowInst/flowInstTab.vue +70 -79
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sasp-flow-render",
3
- "version": "1.0.12",
3
+ "version": "1.0.14",
4
4
  "description": "业务应用支撑平台-智慧流程渲染组件",
5
5
  "scripts": {
6
6
  "build": "vue-cli-service build"
package/src/components/flowInst/flowInstList.vue CHANGED
@@ -15,8 +15,8 @@
15
15
  </el-form-item>
16
16
 
17
17
  <el-form-item label="当前处理人" v-if="isShow('flowQuery')">
18
- <el-input v-model="crud.searchForm.dealUserName" style="width: 90px;">
19
- </el-input>
18
+ <el-input v-model="crud.searchForm.dealUserName" style="width: 90px;">
19
+ </el-input>
20
20
  </el-form-item>
21
21
  <el-form-item label="当前任务" v-if="isShow('pending,processed,flowQuery')">
22
22
  <el-select v-model="crud.searchForm.currentNode" filterable clearable style="width: 130px;">
@@ -55,6 +55,9 @@
55
55
  </el-button>
56
56
  <!-- <el-button type="warning" icon="saspiconfont liuchengtu1" size="small" round>流程图</el-button>-->
57
57
  </div>
58
+ <el-button type="primary" icon="el-icon-document-copy" size="small" round v-if="isShow('pending')"
59
+ @click="openFlowBatchPendingDialog">批量处理
60
+ </el-button>
58
61
  </el-header>
59
62
  <el-main style="height: 100%;padding: 0;" class="main-box">
60
63
  <el-table :data="crud.dataStore.records" :ref="crud.tableRef"
@@ -762,17 +765,17 @@
762
765
  /**
763
766
  * 打开批量处理页面方法
764
767
  */
765
- // async openFlowBatchPendingDialog() {
766
- // if (this.crud.dataStore.records.length == 0) {
767
- // this.$message({
768
- // showClose: true,
769
- // message: '当前没有可处理的流程'
770
- // });
771
- // } else {
772
- // this.openBatchUpdateFlowForm(this.crud.dataStore.records);
773
- // }
774
- //
775
- // },
768
+ async openFlowBatchPendingDialog() {
769
+ if (this.crud.dataStore.records.length == 0) {
770
+ this.$message({
771
+ showClose: true,
772
+ message: '当前没有可处理的流程'
773
+ });
774
+ } else {
775
+ this.openBatchUpdateFlowForm(this.crud.dataStore.records);
776
+ }
777
+
778
+ },
776
779
 
777
780
  /**
778
781
  * 格式化当前任务
package/src/components/flowInst/flowInstTab.vue CHANGED
@@ -200,21 +200,21 @@
200
200
  <template v-if="flowInstDataDialog">
201
201
  <slot name="formInfo"></slot>
202
202
  </template>
203
- <!-- <table-form-render ref="flowInstDataInfo"-->
204
- <!-- :tableview-id="formInfo.tableViewId"-->
205
- <!-- :data-id="formInfo.dataId"-->
206
- <!-- :form-id="formInfo.formId"-->
207
- <!-- :list-view-id="formInfo.listViewId"-->
208
- <!-- :flow-field-status="formInfo.fieldStatus"-->
209
- <!-- :form-operate="formInfo.opt"-->
210
- <!-- :is-flow=true-->
211
- <!-- :use-load-self=true-->
212
- <!-- :flow-field-default="formInfo.fieldDefaultVal"-->
213
- <!-- :flow-field-default-change-num="formInfo.fieldDefaultValChangeNum"-->
214
- <!-- :flow-field-default-from-form="formInfo.flowFieldDefaultFromForm"-->
215
- <!-- :form-field-obj="formFieldObj"-->
216
- <!-- :formPrintVisble="currNodeName">-->
217
- <!-- </table-form-render>-->
203
+ <!-- <table-form-render ref="flowInstDataInfo"-->
204
+ <!-- :tableview-id="formInfo.tableViewId"-->
205
+ <!-- :data-id="formInfo.dataId"-->
206
+ <!-- :form-id="formInfo.formId"-->
207
+ <!-- :list-view-id="formInfo.listViewId"-->
208
+ <!-- :flow-field-status="formInfo.fieldStatus"-->
209
+ <!-- :form-operate="formInfo.opt"-->
210
+ <!-- :is-flow=true-->
211
+ <!-- :use-load-self=true-->
212
+ <!-- :flow-field-default="formInfo.fieldDefaultVal"-->
213
+ <!-- :flow-field-default-change-num="formInfo.fieldDefaultValChangeNum"-->
214
+ <!-- :flow-field-default-from-form="formInfo.flowFieldDefaultFromForm"-->
215
+ <!-- :form-field-obj="formFieldObj"-->
216
+ <!-- :formPrintVisble="currNodeName">-->
217
+ <!-- </table-form-render>-->
218
218
 
219
219
  <div slot="footer" style="height:31px;" class="dialog-footer">
220
220
  <div>
@@ -247,23 +247,11 @@
247
247
  <el-tab-pane
248
248
  v-for="(item, index) in batchUpdateFormInfo.dataRows"
249
249
  :key="item.dataId"
250
- :label="item.startUserName"
250
+ :label="userMap[item.startUserId]"
251
251
  :name="item.dataId" :closable="batchUpdateFormInfo.dataRows.length > 1" :lazy="true">
252
- <table-form-render :ref="`batchTableForm${item.dataId}Ref`"
253
- :tableview-id="formInfo.tableViewId"
254
- :data-id="batchUpdateFormInfo.batchDataId"
255
- :form-id="formInfo.formId"
256
- :list-view-id="formInfo.listViewId"
257
- :flow-field-status="formInfo.fieldStatus"
258
- :form-operate="formInfo.opt"
259
- :is-flow="true"
260
- use-load-self
261
- :flow-field-default="formInfo.fieldDefaultVal"
262
- :flow-field-default-change-num="formInfo.fieldDefaultValChangeNum"
263
- :flow-field-default-from-form="formInfo.flowFieldDefaultFromForm"
264
- :form-field-obj="formFieldObj"
265
- v-if="batchUpdateFormInfo.formShow && flowBatchPendingDialog">
266
- </table-form-render>
252
+ <template>
253
+ <slot name="formInfo"></slot>
254
+ </template>
267
255
  </el-tab-pane>
268
256
  </el-tabs>
269
257
  <div slot="footer" class="dialog-footer">
@@ -336,12 +324,12 @@
336
324
 
337
325
  <el-dialog :close-on-click-modal=false title="组织岗位用户" top="5vh" width="80%" height="80%"
338
326
  :visible.sync="sysOrgPosUserDialog" append-to-body>
339
- <!-- <sys-org-pos-user-select ref="orgPosUserRef" v-if="sysOrgPosUserDialog"-->
340
- <!-- :filterUserParam="{'commonUserType':'common' }" :ognEnable="false"-->
341
- <!-- :default-user-ids="inclusiveChooseKey ? choosePosUserIdsObj[inclusiveChooseKey]:choosePosUserIds"-->
342
- <!-- defaultChooseIds="$"-->
343
- <!-- :posEnable="false" :checkbox="mulitiChooseUser">-->
344
- <!-- </sys-org-pos-user-select>-->
327
+ <!-- <sys-org-pos-user-select ref="orgPosUserRef" v-if="sysOrgPosUserDialog"-->
328
+ <!-- :filterUserParam="{'commonUserType':'common' }" :ognEnable="false"-->
329
+ <!-- :default-user-ids="inclusiveChooseKey ? choosePosUserIdsObj[inclusiveChooseKey]:choosePosUserIds"-->
330
+ <!-- defaultChooseIds="$"-->
331
+ <!-- :posEnable="false" :checkbox="mulitiChooseUser">-->
332
+ <!-- </sys-org-pos-user-select>-->
345
333
  <user-select ref="orgPosUserRef"
346
334
  :choose-user-ids="inclusiveChooseKey ? choosePosUserIdsObj[inclusiveChooseKey]:choosePosUserIds"
347
335
  :checkbox="mulitiChooseUser" v-if="sysOrgPosUserDialog">
@@ -354,14 +342,14 @@
354
342
 
355
343
  <el-dialog :close-on-click-modal=false title="选择加签人" top="5vh" width="80%" height="80%"
356
344
  :visible.sync="completeSignDialog" append-to-body>
357
- <!-- <sys-org-pos-user-select ref="completeSignRef"-->
358
- <!-- :filterUserParam="{'commonUserType':'common','filterLoginUser':'Y'}"-->
359
- <!-- :ognEnable="false"-->
360
- <!-- :posEnable="false"-->
361
- <!-- :checkbox="true"-->
362
- <!-- v-if="completeSignDialog"-->
363
- <!-- >-->
364
- <!-- </sys-org-pos-user-select>-->
345
+ <!-- <sys-org-pos-user-select ref="completeSignRef"-->
346
+ <!-- :filterUserParam="{'commonUserType':'common','filterLoginUser':'Y'}"-->
347
+ <!-- :ognEnable="false"-->
348
+ <!-- :posEnable="false"-->
349
+ <!-- :checkbox="true"-->
350
+ <!-- v-if="completeSignDialog"-->
351
+ <!-- >-->
352
+ <!-- </sys-org-pos-user-select>-->
365
353
  <user-select ref="completeSignRef"
366
354
  v-if="completeSignDialog">
367
355
  </user-select>
@@ -373,14 +361,14 @@
373
361
 
374
362
  <el-dialog :close-on-click-modal=false title="选择转签人" top="5vh" width="80%" height="80%"
375
363
  :visible.sync="turnSignDialog" append-to-body>
376
- <!-- <sys-org-pos-user-select ref="turnSignRef"-->
377
- <!-- :filterUserParam="{'commonUserType':'common' }"-->
378
- <!-- :ognEnable="false"-->
379
- <!-- :posEnable="false"-->
380
- <!-- :checkbox="false"-->
381
- <!-- v-if="turnSignDialog"-->
382
- <!-- >-->
383
- <!-- </sys-org-pos-user-select>-->
364
+ <!-- <sys-org-pos-user-select ref="turnSignRef"-->
365
+ <!-- :filterUserParam="{'commonUserType':'common' }"-->
366
+ <!-- :ognEnable="false"-->
367
+ <!-- :posEnable="false"-->
368
+ <!-- :checkbox="false"-->
369
+ <!-- v-if="turnSignDialog"-->
370
+ <!-- >-->
371
+ <!-- </sys-org-pos-user-select>-->
384
372
  <user-select ref="turnSignRef"
385
373
  :checkbox="false"
386
374
  v-if="turnSignDialog">
@@ -1063,15 +1051,15 @@
1063
1051
  batchDataId: arrRows[0].dataId
1064
1052
  });
1065
1053
 
1054
+ this.flowBatchPendingDialog = true;
1066
1055
  this.initUpdateFlowForm(arrRows[0]).then(()=>{
1067
- this.flowBatchPendingDialog = true;
1068
1056
  this.batchUpdateFormInfo.formShow = true;
1069
1057
  let ref='batchTableForm'+arrRows[0].dataId+'Ref'
1070
1058
 
1071
1059
  this.$nextTick(()=>{
1072
- this.$refs[ref][0].loadData().then(() => {
1073
- this.exeFlowEvent("handle","afterClick",arrRows[0].currentNode,ref);
1074
- })
1060
+ // this.$refs[ref][0].loadData().then(() => {
1061
+ this.exeFlowEvent("handle","afterClick",arrRows[0].currentNode,ref);
1062
+ // })
1075
1063
  })
1076
1064
  });
1077
1065
  },
@@ -1208,6 +1196,9 @@
1208
1196
  this.flowInstDataDialog = false;
1209
1197
  if (resData.flowInstId) {
1210
1198
  this.$message({type: "success", message: "保存成功！"});
1199
+ if (this.flowBatchPendingDialog) {//批量处理 需处理tab页
1200
+ this.batchSaveDraft();
1201
+ }
1211
1202
  } else {
1212
1203
  this.$message({type: "error", message: "保存失败！"});
1213
1204
  }
@@ -1577,9 +1568,9 @@
1577
1568
  let ref='batchTableForm'+dataId+'Ref';
1578
1569
 
1579
1570
  this.$nextTick(()=>{
1580
- this.$refs[ref][0].loadData().then(() => {
1581
- this.exeFlowEvent("handle","afterClick",currentNode,ref);
1582
- })
1571
+ // this.$refs[ref][0].loadData().then(() => {
1572
+ this.exeFlowEvent("handle","afterClick",currentNode,ref);
1573
+ // })
1583
1574
  })
1584
1575
 
1585
1576
  },
@@ -1607,9 +1598,9 @@
1607
1598
  this.initUpdateFlowForm(nextTab).then(()=>{
1608
1599
  this.$nextTick(()=>{
1609
1600
  let ref='batchTableForm'+nextTab.dataId+'Ref';
1610
- this.$refs[ref][0].loadData().then(() => {
1611
- this.exeFlowEvent("handle","afterClick",nextTab.currentNode,ref);
1612
- })
1601
+ // this.$refs[ref][0].loadData().then(() => {
1602
+ this.exeFlowEvent("handle","afterClick",nextTab.currentNode,ref);
1603
+ // })
1613
1604
  })
1614
1605
  });
1615
1606
  }
@@ -2162,9 +2153,9 @@
2162
2153
  /**
2163
2154
  * 批量处理存草稿
2164
2155
  */
2165
- // batchSaveDraft() {
2166
- // this.batchTabRemove(this.currentInst.dataId);
2167
- // },
2156
+ batchSaveDraft() {
2157
+ this.batchTabRemove(this.currentInst.dataId);
2158
+ },
2168
2159
 
2169
2160
 
2170
2161
  /**
@@ -2276,8 +2267,8 @@
2276
2267
  // }
2277
2268
  //工作流节点
2278
2269
  this.startNodeKey = "Activity_draft";
2279
- this.startNodeKeyObj = {};
2280
- // let flowVersion = this.flowDefine.flowVersion || '1.0';
2270
+ this.startNodeKeyObj = {};
2271
+ // let flowVersion = this.flowDefine.flowVersion || '1.0';
2281
2272
  this.FLOW_GLOBAL.getFlowNodesByFlowId(this.flowData.flowId).then(nodeDatas => {
2282
2273
  if (nodeDatas) {
2283
2274
  nodeDatas.forEach(item => {
@@ -2290,19 +2281,19 @@
2290
2281
  }
2291
2282
  this.$set(this.flowVersionNodeObj[item.version],item.nodeLinkId,item); //版本节点对象
2292
2283
  // if(item.version == this.flowDefine.releaseVersion){ //节点信息只取最新版本
2293
- this.flowNodeIdToInfo[item.id] = item;
2294
- if(item.nodeType&&['StartEvent','ParallelGateway','SequenceFlow','ExclusiveGateway','InclusiveGateway'].indexOf(item.nodeType) == -1){
2295
- if(!this.flowNodeNameObj[item.nodeLinkId]){
2296
- this.$set(this.flowNodeNameObj,item.nodeLinkId,item.nodeName);
2297
- }else {
2298
- if(this.flowNodeNameObj[item.nodeLinkId] != item.nodeName){
2299
- this.flowNodeNameObj[item.nodeLinkId] = this.flowNodeNameObj[item.nodeLinkId] + "," + item.nodeName;
2300
- }
2284
+ this.flowNodeIdToInfo[item.id] = item;
2285
+ if(item.nodeType&&['StartEvent','ParallelGateway','SequenceFlow','ExclusiveGateway','InclusiveGateway'].indexOf(item.nodeType) == -1){
2286
+ if(!this.flowNodeNameObj[item.nodeLinkId]){
2287
+ this.$set(this.flowNodeNameObj,item.nodeLinkId,item.nodeName);
2288
+ }else {
2289
+ if(this.flowNodeNameObj[item.nodeLinkId] != item.nodeName){
2290
+ this.flowNodeNameObj[item.nodeLinkId] = this.flowNodeNameObj[item.nodeLinkId] + "," + item.nodeName;
2301
2291
  }
2302
2292
  }
2303
- if(item.nodeType == "UserTask" && (item.nodeLinkId || "").indexOf("Activity_draft") > -1){
2304
- this.draftNodeId = item.id; // 草稿节点id
2305
- }
2293
+ }
2294
+ if(item.nodeType == "UserTask" && (item.nodeLinkId || "").indexOf("Activity_draft") > -1){
2295
+ this.draftNodeId = item.id; // 草稿节点id
2296
+ }
2306
2297
  // }
2307
2298
  this.allNodeInfo[item.id] = item;
2308
2299
  // 行按钮