eoss-ui 0.6.93 → 0.6.94
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/lib/data-table.js +29 -17
- package/lib/eoss-ui.common.js +277 -210
- package/lib/flow.js +204 -154
- package/lib/index.js +1 -1
- package/lib/main.js +14 -8
- package/lib/select.js +6 -2
- package/lib/tree.js +3 -3
- package/lib/upload.js +6 -11
- package/package.json +2 -2
- package/packages/data-table/src/column.vue +0 -2
- package/packages/data-table/src/main.vue +12 -3
- package/packages/flow/src/component/Circulate.vue +7 -4
- package/packages/flow/src/component/SendMsg.vue +5 -4
- package/packages/flow/src/component/taskUnionExamine.vue +4 -3
- package/packages/flow/src/main.vue +22 -12
- package/packages/flow/src/processForm.vue +11 -5
- package/packages/flow/src/processReject.vue +12 -9
- package/packages/flow/src/reset.vue +4 -4
- package/packages/flow/src/startTaskRead.vue +1 -4
- package/packages/flow/src/supervise.vue +16 -9
- package/packages/main/src/public/search.vue +7 -1
- package/packages/select/src/main.vue +6 -2
- package/packages/tree/src/main.vue +1 -1
- package/packages/upload/src/main.vue +1 -6
- package/src/index.js +1 -1
package/lib/main.js
CHANGED
|
@@ -9592,8 +9592,8 @@ var online_component = Object(componentNormalizer["a" /* default */])(
|
|
|
9592
9592
|
)
|
|
9593
9593
|
|
|
9594
9594
|
/* harmony default export */ var online = (online_component.exports);
|
|
9595
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=template&id=
|
|
9596
|
-
var
|
|
9595
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=template&id=c94b9f7c&
|
|
9596
|
+
var searchvue_type_template_id_c94b9f7c_render = function () {
|
|
9597
9597
|
var _vm = this
|
|
9598
9598
|
var _h = _vm.$createElement
|
|
9599
9599
|
var _c = _vm._self._c || _h
|
|
@@ -10008,11 +10008,11 @@ var searchvue_type_template_id_46cd8f32_render = function () {
|
|
|
10008
10008
|
1
|
|
10009
10009
|
)
|
|
10010
10010
|
}
|
|
10011
|
-
var
|
|
10012
|
-
|
|
10011
|
+
var searchvue_type_template_id_c94b9f7c_staticRenderFns = []
|
|
10012
|
+
searchvue_type_template_id_c94b9f7c_render._withStripped = true
|
|
10013
10013
|
|
|
10014
10014
|
|
|
10015
|
-
// CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=
|
|
10015
|
+
// CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=c94b9f7c&
|
|
10016
10016
|
|
|
10017
10017
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=script&lang=js&
|
|
10018
10018
|
var searchvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
|
|
@@ -10247,7 +10247,7 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
|
|
|
10247
10247
|
beforeCreate: function beforeCreate() {
|
|
10248
10248
|
var _this = this;
|
|
10249
10249
|
|
|
10250
|
-
this.handleSearchAll = Object(external_throttle_debounce_["debounce"])(
|
|
10250
|
+
this.handleSearchAll = Object(external_throttle_debounce_["debounce"])(1000, function (res) {
|
|
10251
10251
|
_this.searchAll(res);
|
|
10252
10252
|
});
|
|
10253
10253
|
this.handleSearchd = Object(external_throttle_debounce_["debounce"])(500, function (obj, index) {
|
|
@@ -10333,6 +10333,12 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
|
|
|
10333
10333
|
for (var i = 0; i < this.types.length; i++) {
|
|
10334
10334
|
var item = this.types[i];
|
|
10335
10335
|
if (keyWords && !this.hides.includes(item.name) && !item.hide) {
|
|
10336
|
+
this.types[i].records = [];
|
|
10337
|
+
this.types[i].totalCount = 0;
|
|
10338
|
+
this.types[i].pageCount = 1;
|
|
10339
|
+
this.types[i].pageNum = 0;
|
|
10340
|
+
this.$set(this.loadings, item.id || String(i), true);
|
|
10341
|
+
this.$set(this.noMore, item.id || String(i), false);
|
|
10336
10342
|
if (item.name == '菜单' && this.menus.length) {
|
|
10337
10343
|
this.isLoading = false;
|
|
10338
10344
|
this.types[i].records = this.searchData(this.menus, keyWords);
|
|
@@ -10475,8 +10481,8 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
|
|
|
10475
10481
|
|
|
10476
10482
|
var search_component = Object(componentNormalizer["a" /* default */])(
|
|
10477
10483
|
public_searchvue_type_script_lang_js_,
|
|
10478
|
-
|
|
10479
|
-
|
|
10484
|
+
searchvue_type_template_id_c94b9f7c_render,
|
|
10485
|
+
searchvue_type_template_id_c94b9f7c_staticRenderFns,
|
|
10480
10486
|
false,
|
|
10481
10487
|
null,
|
|
10482
10488
|
null,
|
package/lib/select.js
CHANGED
|
@@ -4933,13 +4933,17 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
|
|
|
4933
4933
|
} else {
|
|
4934
4934
|
dom = [this.getLabel(this.models, this.results)];
|
|
4935
4935
|
}
|
|
4936
|
+
console.log('dom', dom);
|
|
4936
4937
|
return h('div', {
|
|
4937
4938
|
class: [{
|
|
4938
4939
|
'es-plain': this.plain,
|
|
4939
4940
|
'es-textarea__inner el-textarea__inner': this.multiple,
|
|
4940
4941
|
'el-input__inner es-input__inner': !this.multiple
|
|
4941
|
-
}]
|
|
4942
|
-
|
|
4942
|
+
}],
|
|
4943
|
+
domProps: {
|
|
4944
|
+
innerHTML: dom.join(this.symbol)
|
|
4945
|
+
}
|
|
4946
|
+
}, []);
|
|
4943
4947
|
}
|
|
4944
4948
|
var doms = [];
|
|
4945
4949
|
var cls = [];
|
package/lib/tree.js
CHANGED
|
@@ -4159,7 +4159,7 @@ module.exports = require("axios");
|
|
|
4159
4159
|
// ESM COMPAT FLAG
|
|
4160
4160
|
__webpack_require__.r(__webpack_exports__);
|
|
4161
4161
|
|
|
4162
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=
|
|
4162
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=cd716718&
|
|
4163
4163
|
var render = function () {
|
|
4164
4164
|
var _vm = this
|
|
4165
4165
|
var _h = _vm.$createElement
|
|
@@ -4361,7 +4361,7 @@ var staticRenderFns = []
|
|
|
4361
4361
|
render._withStripped = true
|
|
4362
4362
|
|
|
4363
4363
|
|
|
4364
|
-
// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=
|
|
4364
|
+
// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=cd716718&
|
|
4365
4365
|
|
|
4366
4366
|
// EXTERNAL MODULE: ./src/config/api.js
|
|
4367
4367
|
var api = __webpack_require__(1);
|
|
@@ -4576,7 +4576,7 @@ var util = __webpack_require__(0);
|
|
|
4576
4576
|
//懒加载
|
|
4577
4577
|
lazy: {
|
|
4578
4578
|
type: Boolean,
|
|
4579
|
-
default:
|
|
4579
|
+
default: false
|
|
4580
4580
|
},
|
|
4581
4581
|
onChange: Function,
|
|
4582
4582
|
onSearch: Function,
|
package/lib/upload.js
CHANGED
|
@@ -4353,8 +4353,8 @@ module.exports = require("js-base64");
|
|
|
4353
4353
|
// ESM COMPAT FLAG
|
|
4354
4354
|
__webpack_require__.r(__webpack_exports__);
|
|
4355
4355
|
|
|
4356
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=
|
|
4357
|
-
var
|
|
4356
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=7a96bed3&
|
|
4357
|
+
var mainvue_type_template_id_7a96bed3_render = function () {
|
|
4358
4358
|
var _vm = this
|
|
4359
4359
|
var _h = _vm.$createElement
|
|
4360
4360
|
var _c = _vm._self._c || _h
|
|
@@ -4735,10 +4735,10 @@ var mainvue_type_template_id_02b1ced8_render = function () {
|
|
|
4735
4735
|
: _vm._e()
|
|
4736
4736
|
}
|
|
4737
4737
|
var staticRenderFns = []
|
|
4738
|
-
|
|
4738
|
+
mainvue_type_template_id_7a96bed3_render._withStripped = true
|
|
4739
4739
|
|
|
4740
4740
|
|
|
4741
|
-
// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=
|
|
4741
|
+
// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=7a96bed3&
|
|
4742
4742
|
|
|
4743
4743
|
// EXTERNAL MODULE: ./src/config/api.js
|
|
4744
4744
|
var api = __webpack_require__(1);
|
|
@@ -5007,12 +5007,7 @@ var _props;
|
|
|
5007
5007
|
type: Boolean,
|
|
5008
5008
|
default: true
|
|
5009
5009
|
},
|
|
5010
|
-
headers:
|
|
5011
|
-
type: Object,
|
|
5012
|
-
default: function _default() {
|
|
5013
|
-
return util["a" /* default */].getStorage();
|
|
5014
|
-
}
|
|
5015
|
-
},
|
|
5010
|
+
headers: Object,
|
|
5016
5011
|
listType: {
|
|
5017
5012
|
type: String,
|
|
5018
5013
|
default: 'table' // text,table,picture,picture-card
|
|
@@ -5916,7 +5911,7 @@ var componentNormalizer = __webpack_require__(3);
|
|
|
5916
5911
|
|
|
5917
5912
|
var component = Object(componentNormalizer["a" /* default */])(
|
|
5918
5913
|
src_mainvue_type_script_lang_js_,
|
|
5919
|
-
|
|
5914
|
+
mainvue_type_template_id_7a96bed3_render,
|
|
5920
5915
|
staticRenderFns,
|
|
5921
5916
|
false,
|
|
5922
5917
|
null,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "eoss-ui",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.94",
|
|
4
4
|
"description": "eoss内部业务组件",
|
|
5
5
|
"main": "lib/eoss-ui.common.js",
|
|
6
6
|
"files": [
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"cp-cli": "^1.0.2",
|
|
100
100
|
"cross-env": "^3.1.3",
|
|
101
101
|
"css-loader": "^2.1.0",
|
|
102
|
-
"eoss-element": "^0.3.
|
|
102
|
+
"eoss-element": "^0.3.53",
|
|
103
103
|
"es6-promise": "^4.0.5",
|
|
104
104
|
"eslint": "4.18.2",
|
|
105
105
|
"eslint-config-elemefe": "0.1.1",
|
|
@@ -32,7 +32,8 @@
|
|
|
32
32
|
tabs: handleTabs,
|
|
33
33
|
reset: hanleReset,
|
|
34
34
|
cancel: hanleCancel,
|
|
35
|
-
|
|
35
|
+
toolbarChange: toolbarChange,
|
|
36
|
+
...toolbarEvents
|
|
36
37
|
}"
|
|
37
38
|
></es-toolbar>
|
|
38
39
|
<p v-if="title" ref="title" class="es-table-title" v-html="title"></p>
|
|
@@ -309,7 +310,7 @@ export default {
|
|
|
309
310
|
},
|
|
310
311
|
// 工具栏配置
|
|
311
312
|
toolbar: {
|
|
312
|
-
type: [Array, Boolean],
|
|
313
|
+
type: [Array, Object, Boolean],
|
|
313
314
|
default: false
|
|
314
315
|
},
|
|
315
316
|
showLabel: Boolean,
|
|
@@ -508,6 +509,7 @@ export default {
|
|
|
508
509
|
isEncryption: this.isFieldsEncryption,
|
|
509
510
|
requests: [],
|
|
510
511
|
toolbars: [],
|
|
512
|
+
toolbarEvents: {},
|
|
511
513
|
hasThead: false,
|
|
512
514
|
theadData: [],
|
|
513
515
|
list: [],
|
|
@@ -705,9 +707,13 @@ export default {
|
|
|
705
707
|
];
|
|
706
708
|
}
|
|
707
709
|
return this.toolbar;
|
|
708
|
-
} else {
|
|
710
|
+
} else if (Array.isArray(this.toolbar)) {
|
|
709
711
|
this.toolbars = this.toolbar;
|
|
710
712
|
return true;
|
|
713
|
+
} else {
|
|
714
|
+
this.toolbars = this.toolbar.contents;
|
|
715
|
+
this.toolbarEvents = this.toolbar.events || {};
|
|
716
|
+
return true;
|
|
711
717
|
}
|
|
712
718
|
},
|
|
713
719
|
optionDatas: {
|
|
@@ -1313,6 +1319,9 @@ export default {
|
|
|
1313
1319
|
this.$emit('edit', data, this.list);
|
|
1314
1320
|
this.$emit('change', data, this.list);
|
|
1315
1321
|
},
|
|
1322
|
+
toolbarChange(...args) {
|
|
1323
|
+
this.$emit('toolbar-change', ...args);
|
|
1324
|
+
},
|
|
1316
1325
|
handleAjax(handle, row) {
|
|
1317
1326
|
this.changeLoading(true, `${handle.text}中...`);
|
|
1318
1327
|
let params = handle.param || {};
|
|
@@ -31,12 +31,14 @@
|
|
|
31
31
|
:params="otherParams"
|
|
32
32
|
/>
|
|
33
33
|
</el-form-item>
|
|
34
|
+
|
|
35
|
+
<!-- :rules="[
|
|
36
|
+
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
37
|
+
]" -->
|
|
34
38
|
<el-form-item
|
|
35
39
|
prop="noticeType"
|
|
36
40
|
label="通知方式"
|
|
37
|
-
|
|
38
|
-
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
39
|
-
]"
|
|
41
|
+
v-show="infoList.noticeList != 0"
|
|
40
42
|
>
|
|
41
43
|
<el-checkbox-group
|
|
42
44
|
v-model="infoList.noticeType"
|
|
@@ -316,7 +318,8 @@ export default {
|
|
|
316
318
|
params: {
|
|
317
319
|
ccCode: 'notification_type',
|
|
318
320
|
userId: util.getStorage('userId'),
|
|
319
|
-
pendingId:this.pendingId
|
|
321
|
+
pendingId:this.pendingId,
|
|
322
|
+
startCircularRead:true
|
|
320
323
|
}
|
|
321
324
|
})
|
|
322
325
|
.then((res) => {
|
|
@@ -9,12 +9,13 @@
|
|
|
9
9
|
<el-form-item prop="nodeName" label="标题">
|
|
10
10
|
<div>{{ sendInfo.title }}</div>
|
|
11
11
|
</el-form-item>
|
|
12
|
+
<!-- :rules="[
|
|
13
|
+
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
14
|
+
]" -->
|
|
12
15
|
<el-form-item
|
|
13
16
|
prop="notificationType"
|
|
14
17
|
label="通知方式"
|
|
15
|
-
|
|
16
|
-
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
17
|
-
]"
|
|
18
|
+
v-show="notificationList.length != 0"
|
|
18
19
|
>
|
|
19
20
|
<el-checkbox-group
|
|
20
21
|
v-model="sendInfo.notificationType"
|
|
@@ -34,7 +35,7 @@
|
|
|
34
35
|
</el-checkbox>
|
|
35
36
|
</el-checkbox-group>
|
|
36
37
|
</el-form-item>
|
|
37
|
-
<el-form-item prop="nextNode" label="通知消息">
|
|
38
|
+
<el-form-item prop="nextNode" label="通知消息" v-show="notificationList.length != 0">
|
|
38
39
|
<el-input
|
|
39
40
|
type="textarea"
|
|
40
41
|
autosize
|
|
@@ -79,12 +79,13 @@
|
|
|
79
79
|
:tabs="foreignOrgTabsParam"
|
|
80
80
|
/>
|
|
81
81
|
</el-form-item>
|
|
82
|
+
<!-- :rules="[
|
|
83
|
+
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
84
|
+
]" -->
|
|
82
85
|
<el-form-item
|
|
83
86
|
prop="noticeType"
|
|
84
87
|
label="通知方式"
|
|
85
|
-
|
|
86
|
-
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
87
|
-
]"
|
|
88
|
+
v-show="infoList.noticeList.length != 0"
|
|
88
89
|
>
|
|
89
90
|
<el-checkbox-group
|
|
90
91
|
v-model="infoList.noticeType"
|
|
@@ -674,10 +674,11 @@
|
|
|
674
674
|
:showBtn="false"
|
|
675
675
|
:formTitle="formTitle"
|
|
676
676
|
:urgencyLevel="urgencyLevel"
|
|
677
|
-
:messageType=
|
|
677
|
+
:messageType="newsList"
|
|
678
678
|
:copy-history="freeStartFlowParams.pendedHistoryHandle"
|
|
679
679
|
:process-definition-id="freeStartFlowNextNode || nodeInfo.nextNode"
|
|
680
680
|
:opinion="value"
|
|
681
|
+
:keyCount="msgTypeCount"
|
|
681
682
|
:pendingId="pendingId"
|
|
682
683
|
:taskExamineParam="freeStartFlowParams.newFlowStartNodeItemName"
|
|
683
684
|
:taskParams="taskParams"
|
|
@@ -705,7 +706,7 @@
|
|
|
705
706
|
:oldOption="value"
|
|
706
707
|
@cancel="closeProcess($event, 'circulateVisible')"
|
|
707
708
|
/>
|
|
708
|
-
<div v-if="!isFlow && isSpecial" style="padding: 5px; background: #fff">
|
|
709
|
+
<div v-if="!isFlow && isSpecial && newsList.length>0" style="padding: 5px; background: #fff">
|
|
709
710
|
<div class="news" @click="showMessage">
|
|
710
711
|
<span class="news-item">消息通知</span>
|
|
711
712
|
<span :class="showNews ? 'show' : 'sj'"></span>
|
|
@@ -1004,7 +1005,7 @@
|
|
|
1004
1005
|
:simpleTips="simpleTips"
|
|
1005
1006
|
:show-reject="showReject"
|
|
1006
1007
|
:news-info="nextNode.notificationMsg"
|
|
1007
|
-
@cancel="closeProcess(
|
|
1008
|
+
@cancel="closeProcess($event, 'showReject')"
|
|
1008
1009
|
/>
|
|
1009
1010
|
</es-dialog>
|
|
1010
1011
|
<es-dialog
|
|
@@ -1456,6 +1457,7 @@ export default {
|
|
|
1456
1457
|
isCirculate: {
|
|
1457
1458
|
handler(val) {
|
|
1458
1459
|
if (!val && this.showCirculate != undefined) {
|
|
1460
|
+
this.showCirculate = val;
|
|
1459
1461
|
this.getInfo();
|
|
1460
1462
|
}
|
|
1461
1463
|
this.showCirculate = val;
|
|
@@ -1577,7 +1579,11 @@ export default {
|
|
|
1577
1579
|
},
|
|
1578
1580
|
getInfo() {
|
|
1579
1581
|
if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
|
|
1580
|
-
this.
|
|
1582
|
+
if(this.showCirculate != undefined && !this.showCirculate && this.urgencyLevel){
|
|
1583
|
+
this.getAdminMsgType()
|
|
1584
|
+
}else{
|
|
1585
|
+
this.getNodeType();
|
|
1586
|
+
}
|
|
1581
1587
|
!this.isFlow &&
|
|
1582
1588
|
(this.newTypeCode = this.typeCode || this.$route.query.typecode);
|
|
1583
1589
|
if (this.isFlow) {
|
|
@@ -1951,15 +1957,16 @@ export default {
|
|
|
1951
1957
|
}
|
|
1952
1958
|
},
|
|
1953
1959
|
getNodeType() {
|
|
1960
|
+
let params = {
|
|
1961
|
+
url: findCodeValues,
|
|
1962
|
+
params: {
|
|
1963
|
+
ccCode: 'notification_type',
|
|
1964
|
+
userId: util.getStorage('userId'),
|
|
1965
|
+
pendingId: this.pendingId,
|
|
1966
|
+
}
|
|
1967
|
+
};
|
|
1954
1968
|
util
|
|
1955
|
-
.ajax(
|
|
1956
|
-
url: findCodeValues,
|
|
1957
|
-
params: {
|
|
1958
|
-
ccCode: 'notification_type',
|
|
1959
|
-
userId: util.getStorage('userId'),
|
|
1960
|
-
pendingId: this.pendingId
|
|
1961
|
-
}
|
|
1962
|
-
})
|
|
1969
|
+
.ajax(params)
|
|
1963
1970
|
.then((res) => {
|
|
1964
1971
|
const { status, data } = res;
|
|
1965
1972
|
if (status === 'success') {
|
|
@@ -3257,6 +3264,9 @@ export default {
|
|
|
3257
3264
|
if (this.nodeInfo.nextNode) {
|
|
3258
3265
|
this.handleChange(this.nodeInfo.nextNode);
|
|
3259
3266
|
}
|
|
3267
|
+
if(this.showCirculate != undefined && !this.showCirculate && this.urgencyLevel){
|
|
3268
|
+
this.getAdminMsgType()
|
|
3269
|
+
}
|
|
3260
3270
|
}
|
|
3261
3271
|
} else {
|
|
3262
3272
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
@@ -248,7 +248,7 @@
|
|
|
248
248
|
v-model="nextNode.handleExplain"
|
|
249
249
|
/>
|
|
250
250
|
</el-form-item>
|
|
251
|
-
<el-form-item prop="noticeType" label="通知方式" v-show="showBtn">
|
|
251
|
+
<el-form-item prop="noticeType" label="通知方式" v-show="showBtn && nextNode.noticeList.length>0">
|
|
252
252
|
<el-checkbox-group v-model="nextNode.noticeType">
|
|
253
253
|
<el-checkbox
|
|
254
254
|
v-for="item of nextNode.noticeList"
|
|
@@ -327,7 +327,7 @@
|
|
|
327
327
|
</div>
|
|
328
328
|
</el-form-item>
|
|
329
329
|
</el-form>
|
|
330
|
-
<div v-if="!showBtn" style="padding: 5px; background: #fff">
|
|
330
|
+
<div v-if="!showBtn && nextNode.noticeList.length>0" style="padding: 5px; background: #fff">
|
|
331
331
|
<div class="news" @click="showNews = !showNews">
|
|
332
332
|
<span class="news-item">消息通知</span>
|
|
333
333
|
<span :class="showNews ? 'show' : 'sj'"></span>
|
|
@@ -451,7 +451,11 @@ export default {
|
|
|
451
451
|
urgencyLevel:{
|
|
452
452
|
type:[Number,String],
|
|
453
453
|
default:''
|
|
454
|
-
}
|
|
454
|
+
},
|
|
455
|
+
keyCount:{
|
|
456
|
+
type:[Number,String],
|
|
457
|
+
default:0
|
|
458
|
+
},
|
|
455
459
|
},
|
|
456
460
|
data() {
|
|
457
461
|
return {
|
|
@@ -550,7 +554,7 @@ export default {
|
|
|
550
554
|
watch: {
|
|
551
555
|
messageType:{
|
|
552
556
|
handler(val) {
|
|
553
|
-
if (
|
|
557
|
+
if (this.urgencyLevel) {
|
|
554
558
|
this.nextNode.noticeList = val;
|
|
555
559
|
let arr = [];
|
|
556
560
|
this.nextNode.noticeList.map((item) => {
|
|
@@ -604,7 +608,9 @@ export default {
|
|
|
604
608
|
this.getUserInfo();
|
|
605
609
|
},
|
|
606
610
|
mounted() {
|
|
607
|
-
this.
|
|
611
|
+
if(!this.urgencyLevel){
|
|
612
|
+
this.getNodeType();
|
|
613
|
+
}
|
|
608
614
|
this.getStartFlow(this.processDefinitionId);
|
|
609
615
|
if (this.copyHistory) {
|
|
610
616
|
this.nextNode.newOpinion = this.opinion;
|
|
@@ -30,12 +30,13 @@
|
|
|
30
30
|
</el-radio>
|
|
31
31
|
</el-radio-group>
|
|
32
32
|
</el-form-item>
|
|
33
|
+
<!-- :rules="[
|
|
34
|
+
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
35
|
+
]" -->
|
|
33
36
|
<el-form-item
|
|
34
37
|
prop="noticeType"
|
|
35
38
|
label="通知方式"
|
|
36
|
-
|
|
37
|
-
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
38
|
-
]"
|
|
39
|
+
v-show="nextNode.noticeList.lemgth != 0"
|
|
39
40
|
>
|
|
40
41
|
<el-checkbox-group v-model="nextNode.noticeType">
|
|
41
42
|
<el-checkbox
|
|
@@ -192,6 +193,7 @@ export default {
|
|
|
192
193
|
this.simpleTips && this.$message.success('操作成功');
|
|
193
194
|
} else {
|
|
194
195
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
196
|
+
this.quit(false);
|
|
195
197
|
}
|
|
196
198
|
})
|
|
197
199
|
.catch((err) => {
|
|
@@ -246,9 +248,11 @@ export default {
|
|
|
246
248
|
util
|
|
247
249
|
.ajax({ url: toTaskRejectHtml, params })
|
|
248
250
|
.then((res) => {
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
251
|
+
|
|
252
|
+
console.log(res,'resssss')
|
|
253
|
+
this.loading = false;
|
|
254
|
+
if (res.status === 'success') {
|
|
255
|
+
const {
|
|
252
256
|
data: {
|
|
253
257
|
rejectTaskNodes,
|
|
254
258
|
taskExamine,
|
|
@@ -257,8 +261,6 @@ export default {
|
|
|
257
261
|
readOnlyNotificationType
|
|
258
262
|
}
|
|
259
263
|
} = res;
|
|
260
|
-
this.loading = false;
|
|
261
|
-
if (status === 'success') {
|
|
262
264
|
this.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
|
|
263
265
|
this.readOnlyNotificationType = readOnlyNotificationType;
|
|
264
266
|
this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
|
|
@@ -280,7 +282,8 @@ export default {
|
|
|
280
282
|
(this.nextNode.nextNodeId = this.rejectObj[0].id);
|
|
281
283
|
}
|
|
282
284
|
} else {
|
|
283
|
-
this.$message.error(message || '系统错误,请联系管理员!');
|
|
285
|
+
this.$message.error(res.message || '系统错误,请联系管理员!');
|
|
286
|
+
this.quit(false);
|
|
284
287
|
}
|
|
285
288
|
})
|
|
286
289
|
.catch((err) => {
|
|
@@ -181,7 +181,7 @@
|
|
|
181
181
|
v-model="nextItemHandleDescription"
|
|
182
182
|
/>
|
|
183
183
|
</el-form-item>
|
|
184
|
-
<el-form-item prop="noticeType" label="通知方式">
|
|
184
|
+
<el-form-item v-show="nextNode.noticeList.length != 0" prop="noticeType" label="通知方式">
|
|
185
185
|
<el-checkbox-group
|
|
186
186
|
v-if="showNoticeType"
|
|
187
187
|
v-model="nextNode.noticeType"
|
|
@@ -540,9 +540,9 @@ export default {
|
|
|
540
540
|
nextOperate,
|
|
541
541
|
newOpinion
|
|
542
542
|
} = this.nextNode;
|
|
543
|
-
if (noticeType.length === 0) {
|
|
544
|
-
|
|
545
|
-
}
|
|
543
|
+
// if (noticeType.length === 0) {
|
|
544
|
+
// return this.$message.warning('请选择通知方式');
|
|
545
|
+
// }
|
|
546
546
|
if (
|
|
547
547
|
this.nodeInfoExtAttr.nodeType != 1 &&
|
|
548
548
|
this.nodeInfoExtAttr.nodeType != 2 &&
|
|
@@ -109,12 +109,9 @@
|
|
|
109
109
|
></el-input>
|
|
110
110
|
</el-form-item>
|
|
111
111
|
<el-form-item
|
|
112
|
-
v-if="configInfo.isCdjxjTaskHandle != 'true'"
|
|
112
|
+
v-if="configInfo.isCdjxjTaskHandle != 'true' && noticeList.length > 0"
|
|
113
113
|
prop="noticeType"
|
|
114
114
|
label="通知方式"
|
|
115
|
-
:rules="[
|
|
116
|
-
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
117
|
-
]"
|
|
118
115
|
>
|
|
119
116
|
<el-checkbox-group
|
|
120
117
|
v-model="nextNode.noticeType"
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
disabled
|
|
27
27
|
/>
|
|
28
28
|
</el-form-item>
|
|
29
|
-
<el-form-item prop="noticeType" label="通知方式">
|
|
29
|
+
<el-form-item v-show="nextNode.notificationType.length > 0" prop="noticeType" label="通知方式">
|
|
30
30
|
<el-checkbox-group v-model="nextNode.noticeType">
|
|
31
31
|
<el-checkbox
|
|
32
32
|
v-for="(item, index) of nextNode.notificationType"
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
</el-checkbox-group>
|
|
39
39
|
</el-form-item>
|
|
40
40
|
<!-- v-show="nextNode.noticeType.length != 0" -->
|
|
41
|
-
<el-form-item prop="notifyMessage" label="通知消息">
|
|
41
|
+
<el-form-item v-show="nextNode.noticeType.length != 0" prop="notifyMessage" label="通知消息">
|
|
42
42
|
<es-input
|
|
43
43
|
style="
|
|
44
44
|
border-color: #ccc;
|
|
@@ -87,11 +87,11 @@ export default {
|
|
|
87
87
|
},
|
|
88
88
|
methods: {
|
|
89
89
|
subProcess() {
|
|
90
|
-
if (this.nextNode.noticeType.length == 0) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
}
|
|
94
|
-
if (!this.nextNode.notifyMessage) {
|
|
90
|
+
// if (this.nextNode.noticeType.length == 0) {
|
|
91
|
+
// this.$message.warning('请选择通知方式');
|
|
92
|
+
// return;
|
|
93
|
+
// }
|
|
94
|
+
if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage) {
|
|
95
95
|
this.$message.warning('请填写通知消息内容');
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
@@ -132,13 +132,20 @@ export default {
|
|
|
132
132
|
})
|
|
133
133
|
.then((res) => {
|
|
134
134
|
this.loading.close();
|
|
135
|
-
if (res.rCode == 0) {
|
|
135
|
+
if (res.rCode == 0 || res.status == "success") {
|
|
136
136
|
this.nextNode = { ...this.nextNode, ...res.results };
|
|
137
|
+
let arr = []
|
|
137
138
|
this.nextNode.noticeType =
|
|
138
139
|
res.results.defaultNotificationType.split(',');
|
|
140
|
+
this.nextNode.notificationType.map(x => {
|
|
141
|
+
if (this.nextNode.noticeType.indexOf(x.cciValue) != -1) {
|
|
142
|
+
arr.push(x.cciValue);
|
|
143
|
+
}
|
|
144
|
+
})
|
|
145
|
+
this.nextNode.noticeType = arr
|
|
139
146
|
} else {
|
|
140
147
|
this.$message({
|
|
141
|
-
message: res.
|
|
148
|
+
message: res.msg || res.message,
|
|
142
149
|
type: 'error'
|
|
143
150
|
});
|
|
144
151
|
this.$emit('cancel');
|
|
@@ -232,7 +232,7 @@ export default {
|
|
|
232
232
|
}
|
|
233
233
|
},
|
|
234
234
|
beforeCreate() {
|
|
235
|
-
this.handleSearchAll = debounce(
|
|
235
|
+
this.handleSearchAll = debounce(1000, (res) => {
|
|
236
236
|
this.searchAll(res);
|
|
237
237
|
});
|
|
238
238
|
this.handleSearchd = debounce(500, (obj, index) => {
|
|
@@ -321,6 +321,12 @@ export default {
|
|
|
321
321
|
for (let i = 0; i < this.types.length; i++) {
|
|
322
322
|
let item = this.types[i];
|
|
323
323
|
if (keyWords && !this.hides.includes(item.name) && !item.hide) {
|
|
324
|
+
this.types[i].records = [];
|
|
325
|
+
this.types[i].totalCount = 0;
|
|
326
|
+
this.types[i].pageCount = 1;
|
|
327
|
+
this.types[i].pageNum = 0;
|
|
328
|
+
this.$set(this.loadings, item.id || String(i), true);
|
|
329
|
+
this.$set(this.noMore, item.id || String(i), false);
|
|
324
330
|
if (item.name == '菜单' && this.menus.length) {
|
|
325
331
|
this.isLoading = false;
|
|
326
332
|
this.types[i].records = this.searchData(this.menus, keyWords);
|
|
@@ -658,6 +658,7 @@ export default {
|
|
|
658
658
|
} else {
|
|
659
659
|
dom = [this.getLabel(this.models, this.results)];
|
|
660
660
|
}
|
|
661
|
+
console.log('dom', dom);
|
|
661
662
|
return h(
|
|
662
663
|
'div',
|
|
663
664
|
{
|
|
@@ -667,9 +668,12 @@ export default {
|
|
|
667
668
|
'es-textarea__inner el-textarea__inner': this.multiple,
|
|
668
669
|
'el-input__inner es-input__inner': !this.multiple
|
|
669
670
|
}
|
|
670
|
-
]
|
|
671
|
+
],
|
|
672
|
+
domProps: {
|
|
673
|
+
innerHTML: dom.join(this.symbol)
|
|
674
|
+
}
|
|
671
675
|
},
|
|
672
|
-
[
|
|
676
|
+
[]
|
|
673
677
|
);
|
|
674
678
|
}
|
|
675
679
|
let doms = [];
|
|
@@ -239,12 +239,7 @@ export default {
|
|
|
239
239
|
type: Boolean,
|
|
240
240
|
default: true
|
|
241
241
|
},
|
|
242
|
-
headers:
|
|
243
|
-
type: Object,
|
|
244
|
-
default() {
|
|
245
|
-
return util.getStorage();
|
|
246
|
-
}
|
|
247
|
-
},
|
|
242
|
+
headers: Object,
|
|
248
243
|
listType: {
|
|
249
244
|
type: String,
|
|
250
245
|
default: 'table' // text,table,picture,picture-card
|