eoss-ui 0.5.81-beta16 → 0.5.81-beta18
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 +208 -54
- package/lib/eoss-ui.common.js +368 -112
- package/lib/flow.js +69 -10
- package/lib/index.js +1 -1
- package/lib/main.js +297 -254
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/toolbar.css +1 -1
- package/package.json +1 -1
- package/packages/data-table/src/column.vue +111 -41
- package/packages/data-table/src/{forms.vue → formItem.vue} +23 -7
- package/packages/data-table/src/main.vue +1 -0
- package/packages/flow/src/main.vue +30 -17
- package/packages/main/src/simplicity/index.vue +48 -14
- package/packages/main/src/simplicity/menu-list.vue +2 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/toolbar.css +1 -1
- package/packages/theme-chalk/src/toolbar.scss +2 -1
- package/src/index.js +1 -1
package/lib/flow.js
CHANGED
|
@@ -4086,7 +4086,7 @@ var component = Object(componentNormalizer["a" /* default */])(
|
|
|
4086
4086
|
// ESM COMPAT FLAG
|
|
4087
4087
|
__webpack_require__.r(__webpack_exports__);
|
|
4088
4088
|
|
|
4089
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=
|
|
4089
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=70282cba&
|
|
4090
4090
|
var render = function () {
|
|
4091
4091
|
var _vm = this
|
|
4092
4092
|
var _h = _vm.$createElement
|
|
@@ -4426,6 +4426,52 @@ var render = function () {
|
|
|
4426
4426
|
],
|
|
4427
4427
|
1
|
|
4428
4428
|
),
|
|
4429
|
+
_vm.isCanPreAddSign
|
|
4430
|
+
? _c(
|
|
4431
|
+
"el-form-item",
|
|
4432
|
+
{
|
|
4433
|
+
attrs: {
|
|
4434
|
+
prop: "addSignMode",
|
|
4435
|
+
label: "加签模式",
|
|
4436
|
+
rules: [
|
|
4437
|
+
{ required: true, trigger: "blur" },
|
|
4438
|
+
],
|
|
4439
|
+
},
|
|
4440
|
+
},
|
|
4441
|
+
[
|
|
4442
|
+
_c(
|
|
4443
|
+
"el-radio-group",
|
|
4444
|
+
{
|
|
4445
|
+
model: {
|
|
4446
|
+
value: _vm.nextNode.addSignMode,
|
|
4447
|
+
callback: function ($$v) {
|
|
4448
|
+
_vm.$set(
|
|
4449
|
+
_vm.nextNode,
|
|
4450
|
+
"addSignMode",
|
|
4451
|
+
$$v
|
|
4452
|
+
)
|
|
4453
|
+
},
|
|
4454
|
+
expression: "nextNode.addSignMode",
|
|
4455
|
+
},
|
|
4456
|
+
},
|
|
4457
|
+
[
|
|
4458
|
+
_c(
|
|
4459
|
+
"el-radio",
|
|
4460
|
+
{ attrs: { label: "preAddSign" } },
|
|
4461
|
+
[_vm._v("前置加签")]
|
|
4462
|
+
),
|
|
4463
|
+
_c(
|
|
4464
|
+
"el-radio",
|
|
4465
|
+
{ attrs: { label: "postAddSign" } },
|
|
4466
|
+
[_vm._v("后置加签")]
|
|
4467
|
+
),
|
|
4468
|
+
],
|
|
4469
|
+
1
|
|
4470
|
+
),
|
|
4471
|
+
],
|
|
4472
|
+
1
|
|
4473
|
+
)
|
|
4474
|
+
: _vm._e(),
|
|
4429
4475
|
],
|
|
4430
4476
|
1
|
|
4431
4477
|
),
|
|
@@ -5152,7 +5198,7 @@ var render = function () {
|
|
|
5152
5198
|
},
|
|
5153
5199
|
],
|
|
5154
5200
|
staticStyle: {
|
|
5155
|
-
|
|
5201
|
+
border: "1px solid #ccc",
|
|
5156
5202
|
padding: "5px",
|
|
5157
5203
|
"border-radius": "5px",
|
|
5158
5204
|
"font-size": "13px",
|
|
@@ -5811,7 +5857,7 @@ var staticRenderFns = []
|
|
|
5811
5857
|
render._withStripped = true
|
|
5812
5858
|
|
|
5813
5859
|
|
|
5814
|
-
// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=
|
|
5860
|
+
// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=70282cba&
|
|
5815
5861
|
|
|
5816
5862
|
// EXTERNAL MODULE: external "babel-runtime/regenerator"
|
|
5817
5863
|
var regenerator_ = __webpack_require__(13);
|
|
@@ -13341,6 +13387,15 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
13341
13387
|
//
|
|
13342
13388
|
//
|
|
13343
13389
|
//
|
|
13390
|
+
//
|
|
13391
|
+
//
|
|
13392
|
+
//
|
|
13393
|
+
//
|
|
13394
|
+
//
|
|
13395
|
+
//
|
|
13396
|
+
//
|
|
13397
|
+
//
|
|
13398
|
+
//
|
|
13344
13399
|
|
|
13345
13400
|
|
|
13346
13401
|
|
|
@@ -13393,6 +13448,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
13393
13448
|
return _ref = {
|
|
13394
13449
|
styles: {},
|
|
13395
13450
|
userModel: {},
|
|
13451
|
+
isCanPreAddSign: false,
|
|
13396
13452
|
nextOtherOrgObjSelect: [],
|
|
13397
13453
|
subProcessColumns: [],
|
|
13398
13454
|
nextCurrentOrgObjSelect: [],
|
|
@@ -13482,6 +13538,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
13482
13538
|
}
|
|
13483
13539
|
}, _ref['isLimitedTimeHandling'] = false, _ref.moreList = [], _ref.newsList = [], _ref.isSpecial = false, _ref.taskId = '', _ref.showNews = false, _ref.userInfo = '', _ref.objType = '', _ref.nodeDefaultSubmitOpinion = '', _ref.nodeDefaultRejectOpinion = '', _ref.choiceOrgId = '', _ref.choiceDeptId = '', _ref.pOrgId = '', _ref.isOpinionRequired = 0, _ref.nextUserSelectList = [], _ref.processObj = {}, _ref.pid = '123', _ref.isCanRemoveSign = false, _ref.isCanAddSign = false, _ref.AddSignUserList = [], _ref.RemoveSignUserList = [], _ref.operationList = [], _ref.userList = [], _ref.handleMode = '', _ref.countersignaturetypeCode = 0, _ref.presetEdit = 0, _ref.isShowNextUser = true, _ref.nextUserTypes = ['employee', 'persongroup'], _ref.nextUserTabs = {}, _ref.presetReadUserId = [], _ref.nextNode = {
|
|
13484
13540
|
nextNodeId: '', // 下步节点
|
|
13541
|
+
addSignMode: 'postAddSign',
|
|
13485
13542
|
isAddSign: '', // 是否加签
|
|
13486
13543
|
isRemoveSign: '', // 是否减签
|
|
13487
13544
|
nextOperate: '', // 下步操作
|
|
@@ -13942,7 +13999,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
13942
13999
|
_this8.showReject = true;
|
|
13943
14000
|
}).catch(function (e) {});
|
|
13944
14001
|
} else {
|
|
13945
|
-
|
|
13946
14002
|
this.showReject = true;
|
|
13947
14003
|
}
|
|
13948
14004
|
},
|
|
@@ -14255,7 +14311,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
14255
14311
|
if (!this.$refs.commonOpinions.validate()) return;
|
|
14256
14312
|
}
|
|
14257
14313
|
if (this.beforeSubmit != undefined) {
|
|
14258
|
-
|
|
14259
14314
|
this.beforeSubmit().then(function (next) {
|
|
14260
14315
|
_this18.saveRejectAndEnd(res);
|
|
14261
14316
|
}).catch(function (e) {});
|
|
@@ -14267,7 +14322,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
14267
14322
|
var _this19 = this;
|
|
14268
14323
|
|
|
14269
14324
|
this.$confirm('确认' + res.value + '?').then(function () {
|
|
14270
|
-
|
|
14271
14325
|
// return this.$message.warning('请填写意见');
|
|
14272
14326
|
var params = {
|
|
14273
14327
|
url: api["ob" /* rejectAndEnd */],
|
|
@@ -14614,12 +14668,14 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
14614
14668
|
isSpecial = _res$data2.isSpecial,
|
|
14615
14669
|
canPresetRead = _res$data2.canPresetRead,
|
|
14616
14670
|
isCdjxjTaskHandle = _res$data2.isCdjxjTaskHandle,
|
|
14617
|
-
taskButtonList = _res$data2.taskButtonList
|
|
14671
|
+
taskButtonList = _res$data2.taskButtonList,
|
|
14672
|
+
isCanPreAddSign = _res$data2.isCanPreAddSign;
|
|
14618
14673
|
|
|
14619
14674
|
_this23.$emit('startTaskRead', res);
|
|
14620
14675
|
_this23.$emit('start-task-read', res);
|
|
14621
14676
|
_this23.currentOrgName = currentOrgName;
|
|
14622
14677
|
_this23.otherOrgName = otherOrgName;
|
|
14678
|
+
_this23.isCanPreAddSign = isCanPreAddSign;
|
|
14623
14679
|
_this23.endFlowInfo.choiceOrgId = choiceOrgId;
|
|
14624
14680
|
_this23.endFlowInfo.choiceDeptId = choiceDeptId;
|
|
14625
14681
|
_this23.endFlowInfo.pendingId = _this23.pendingId;
|
|
@@ -15007,7 +15063,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
15007
15063
|
switch (_context.prev = _context.next) {
|
|
15008
15064
|
case 0:
|
|
15009
15065
|
if (!valid) {
|
|
15010
|
-
_context.next =
|
|
15066
|
+
_context.next = 43;
|
|
15011
15067
|
break;
|
|
15012
15068
|
}
|
|
15013
15069
|
|
|
@@ -15070,6 +15126,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
15070
15126
|
notificationType = _this27.nextNode.notificationType.join(',');
|
|
15071
15127
|
addSignUserId = addSignUserId.join(',');
|
|
15072
15128
|
removeSignUserId = removeSignUserId.join(',');
|
|
15129
|
+
if (!_this27.isCanPreAddSign) {
|
|
15130
|
+
delete _this27.nextNode.addSignMode;
|
|
15131
|
+
}
|
|
15073
15132
|
params = mainvue_type_script_lang_js_extends({}, _this27.nextNode, {
|
|
15074
15133
|
pendingId: _this27.pendingId,
|
|
15075
15134
|
opinion: _this27.isForceDisplayDefaultOptionForPrefix && !_this27.value.startsWith(_this27.nodeDefaultSubmitOpinion) ? _this27.nodeDefaultSubmitOpinion + _this27.value : _this27.value,
|
|
@@ -15125,10 +15184,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
|
|
|
15125
15184
|
}
|
|
15126
15185
|
}));
|
|
15127
15186
|
|
|
15128
|
-
case
|
|
15187
|
+
case 43:
|
|
15129
15188
|
return _context.abrupt('return', false);
|
|
15130
15189
|
|
|
15131
|
-
case
|
|
15190
|
+
case 44:
|
|
15132
15191
|
case 'end':
|
|
15133
15192
|
return _context.stop();
|
|
15134
15193
|
}
|