cloud-web-corejs 1.0.54-dev.267 → 1.0.54-dev.269
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.
- package/package.json +1 -1
- package/src/components/wf/content.vue +27 -25
- package/src/components/wf/wf.js +20 -1
- package/src/views/bd/setting/form_import_log/list.vue +1 -0
- package/src/views/bd/setting/push_data/list.vue +1 -0
- package/src/views/bd/setting/push_data_h/list.vue +1 -0
- package/src/views/user/wf/wf_auto_submit_data/list.vue +2 -0
- package/src/views/user/wf/wf_manage/list.vue +1 -0
package/package.json
CHANGED
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
<div>
|
|
73
73
|
<b :class="{on:tabIndex=='1'}" @click="tabIndex='1'">{{ $t2('任务情况', 'components.wf.taskInfo') }}</b>
|
|
74
74
|
<b :class="{on:tabIndex=='2'}" @click="tabIndex='2'" v-if="toTalk">{{ $t2('流程沟通', 'components.wf.wfTalk') }}</b>
|
|
75
|
-
<b :class="{on:tabIndex=='4'}" @click="tabIndex='4'">{{ $t1('
|
|
75
|
+
<b :class="{on:tabIndex=='4'}" @click="tabIndex='4'" v-if="showWfMemo">{{ $t1('发起人附言') }}</b>
|
|
76
76
|
<b :class="{on:tabIndex=='3'}" @click="tabIndex='3'" v-if="showAllWfOpinon">{{ $t2('全部任务情况', 'components.wf.allTaskInfo') }}</b>
|
|
77
77
|
</div>
|
|
78
78
|
</div>
|
|
@@ -177,29 +177,31 @@
|
|
|
177
177
|
</template>
|
|
178
178
|
</vxe-grid>
|
|
179
179
|
</div>
|
|
180
|
-
<
|
|
181
|
-
<
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
<
|
|
190
|
-
<div class="
|
|
191
|
-
<
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
180
|
+
<template v-if="showWfMemo">
|
|
181
|
+
<div class="task-situation" v-show="tabIndex=='4'">
|
|
182
|
+
<vxe-grid
|
|
183
|
+
ref="table-wfMemo"
|
|
184
|
+
:auto-resize="true"
|
|
185
|
+
v-bind="wfMemoOption"
|
|
186
|
+
@resizable-change="$vxeTableUtil.onColumnWitchChange"
|
|
187
|
+
@custom="$vxeTableUtil.customHandle"
|
|
188
|
+
>
|
|
189
|
+
<template #form>
|
|
190
|
+
<div style="margin-bottom: 8px;" class="clearfix">
|
|
191
|
+
<div class="fl">
|
|
192
|
+
<el-button type="primary" class="button-sty" @click="openWfMemoDialog()"
|
|
193
|
+
icon="el-icon-plus" v-if="wfInfo.toAddMemo">{{ $t2('新增') }}
|
|
194
|
+
</el-button>
|
|
195
|
+
</div>
|
|
196
|
+
<div class="fr">
|
|
197
|
+
<!-- <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="wfMemoSearchEvent">搜索
|
|
198
|
+
</vxe-button> -->
|
|
199
|
+
</div>
|
|
198
200
|
</div>
|
|
199
|
-
</
|
|
200
|
-
</
|
|
201
|
-
</
|
|
202
|
-
</
|
|
201
|
+
</template>
|
|
202
|
+
</vxe-grid>
|
|
203
|
+
</div>
|
|
204
|
+
</template>
|
|
203
205
|
<div class="task-situation" v-show="showAllWfOpinon && tabIndex=='3'"
|
|
204
206
|
style="max-height: 500px; overflow: hidden auto;">
|
|
205
207
|
<div class="item" v-for="wftaskLineData in allWfTaskOpinions" :key="'allWfTaskOpinions'+wftaskLineData.id">
|
|
@@ -318,7 +320,7 @@
|
|
|
318
320
|
</span>
|
|
319
321
|
</el-dialog>
|
|
320
322
|
|
|
321
|
-
|
|
323
|
+
<!--发起人附言-->
|
|
322
324
|
<el-dialog
|
|
323
325
|
v-if="showWfMemoDialog"
|
|
324
326
|
:visible.sync="showWfMemoDialog"
|
|
@@ -331,7 +333,7 @@
|
|
|
331
333
|
v-el-dialog-center
|
|
332
334
|
>
|
|
333
335
|
<template #title>
|
|
334
|
-
<span class="el-dialog__title">{{ $t1('
|
|
336
|
+
<span class="el-dialog__title">{{ $t1('发起人附言') }}<span
|
|
335
337
|
style="margin-left: 10px;margin-right: 10px;">—</span><b
|
|
336
338
|
class="f-red" style="font-size: 12px;">{{ $t2('节点', 'components.wf.node') }}：{{
|
|
337
339
|
wfInfo.taskName
|
package/src/components/wf/wf.js
CHANGED
|
@@ -365,6 +365,7 @@ wfContentMixin = {
|
|
|
365
365
|
revokeForm: {opinion: null},
|
|
366
366
|
showWfInfoTab: false,
|
|
367
367
|
|
|
368
|
+
showWfMemo:false,
|
|
368
369
|
wfMemoOption: {},
|
|
369
370
|
wfMemoForm: {
|
|
370
371
|
receiverName: null,
|
|
@@ -421,7 +422,8 @@ wfContentMixin = {
|
|
|
421
422
|
this.initWfUserParam();
|
|
422
423
|
this.initTabIndex();
|
|
423
424
|
this.initShowTaskInfo();
|
|
424
|
-
this.
|
|
425
|
+
this.getIsShowWfMemo();
|
|
426
|
+
// this.initWfMemo();
|
|
425
427
|
}
|
|
426
428
|
});
|
|
427
429
|
},
|
|
@@ -1320,6 +1322,23 @@ wfContentMixin = {
|
|
|
1320
1322
|
},
|
|
1321
1323
|
});
|
|
1322
1324
|
},
|
|
1325
|
+
getIsShowWfMemo(){
|
|
1326
|
+
let that = getTarget(this);
|
|
1327
|
+
that.$http({
|
|
1328
|
+
url: USER_PREFIX + "/wf_diy_attribute/getValue",
|
|
1329
|
+
method: `post`,
|
|
1330
|
+
data: {attributeKey: "param10"},
|
|
1331
|
+
isLoading: true,
|
|
1332
|
+
success: (res) => {
|
|
1333
|
+
this.showWfMemo = res?.objx === true;
|
|
1334
|
+
if(this.showWfMemo){
|
|
1335
|
+
this.$nextTick(()=>{
|
|
1336
|
+
this.initWfMemo();
|
|
1337
|
+
})
|
|
1338
|
+
}
|
|
1339
|
+
},
|
|
1340
|
+
});
|
|
1341
|
+
},
|
|
1323
1342
|
|
|
1324
1343
|
initWfMemo() {
|
|
1325
1344
|
let h = this.$createElement;
|
|
@@ -100,6 +100,7 @@
|
|
|
100
100
|
size="small"
|
|
101
101
|
clearable
|
|
102
102
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
103
|
+
default-time="23:59:59"
|
|
103
104
|
:picker-options="$baseEndPickerOptions(formData.startToExeTime)"
|
|
104
105
|
></el-date-picker>
|
|
105
106
|
</template>
|
|
@@ -211,6 +212,7 @@
|
|
|
211
212
|
size="small"
|
|
212
213
|
clearable
|
|
213
214
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
215
|
+
default-time="23:59:59"
|
|
214
216
|
:picker-options="$baseEndPickerOptions(formData2.startToExeTime)"
|
|
215
217
|
></el-date-picker>
|
|
216
218
|
</template>
|