saas-tenant-approve-app 0.2.21 → 0.2.23
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/tips.common.js +43 -18
- package/lib/tips.common.js.map +1 -1
- package/lib/tips.css +1 -1
- package/lib/tips.umd.js +43 -18
- package/lib/tips.umd.js.map +1 -1
- package/lib/tips.umd.min.js +1 -1
- package/lib/tips.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/src/components/approveLineAll.vue +31 -9
package/lib/tips.umd.js
CHANGED
|
@@ -14503,8 +14503,8 @@ var component = normalizeComponent(
|
|
|
14503
14503
|
)
|
|
14504
14504
|
|
|
14505
14505
|
/* harmony default export */ var approveLine = (component.exports);
|
|
14506
|
-
;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=template&id=
|
|
14507
|
-
var
|
|
14506
|
+
;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=template&id=6fae4198&scoped=true
|
|
14507
|
+
var approveLineAllvue_type_template_id_6fae4198_scoped_true_render = function render() {
|
|
14508
14508
|
var _vm = this,
|
|
14509
14509
|
_c = _vm._self._c;
|
|
14510
14510
|
return _c('div', {
|
|
@@ -14591,6 +14591,10 @@ var approveLineAllvue_type_template_id_79c4d0e4_scoped_true_render = function re
|
|
|
14591
14591
|
"type": "primary"
|
|
14592
14592
|
}
|
|
14593
14593
|
}, [_vm._v("依次")]) : _vm._e(), _vm.ableEdit(step) && _vm.data.editApprover && step.unApprovedFlag ? _c('van-button', {
|
|
14594
|
+
staticStyle: {
|
|
14595
|
+
"position": "relative",
|
|
14596
|
+
"top": "-4px"
|
|
14597
|
+
},
|
|
14594
14598
|
attrs: {
|
|
14595
14599
|
"icon": "plus",
|
|
14596
14600
|
"size": "mini",
|
|
@@ -14705,7 +14709,7 @@ var approveLineAllvue_type_template_id_79c4d0e4_scoped_true_render = function re
|
|
|
14705
14709
|
}
|
|
14706
14710
|
}, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
|
|
14707
14711
|
};
|
|
14708
|
-
var
|
|
14712
|
+
var approveLineAllvue_type_template_id_6fae4198_scoped_true_staticRenderFns = [];
|
|
14709
14713
|
|
|
14710
14714
|
// EXTERNAL MODULE: ./node_modules/qs/lib/index.js
|
|
14711
14715
|
var lib = __webpack_require__(2404);
|
|
@@ -15350,11 +15354,16 @@ approveMobileTree.prototype = {
|
|
|
15350
15354
|
},
|
|
15351
15355
|
async getProjectNodes() {
|
|
15352
15356
|
let that = this;
|
|
15357
|
+
let formDataList = [{
|
|
15358
|
+
lable: "部门主要负责人",
|
|
15359
|
+
value: that.data.mainDeptLeader ? "是" : "否"
|
|
15360
|
+
}];
|
|
15353
15361
|
projectCustomNodes(that.SAAS_TENANT_API, {
|
|
15354
15362
|
outApprove: true,
|
|
15355
15363
|
uid: that.data.uid,
|
|
15356
15364
|
id: that.data.id,
|
|
15357
|
-
aprId: that.data.aprId
|
|
15365
|
+
aprId: that.data.aprId,
|
|
15366
|
+
formDataList: formDataList
|
|
15358
15367
|
}).then(async res => {
|
|
15359
15368
|
if (res.status == 200 && res.result && res.result.data) {
|
|
15360
15369
|
let approveList = res.result.data.map(async (item, index) => {
|
|
@@ -15453,14 +15462,26 @@ approveMobileTree.prototype = {
|
|
|
15453
15462
|
if (me.approveList && me.approveList.length > 0) {
|
|
15454
15463
|
var node = me.approveList.find(item => item.id == step.nodeId);
|
|
15455
15464
|
let defaultKey = [];
|
|
15456
|
-
if (
|
|
15457
|
-
|
|
15458
|
-
|
|
15459
|
-
|
|
15460
|
-
|
|
15461
|
-
|
|
15462
|
-
|
|
15463
|
-
|
|
15465
|
+
if (node.nodeType == 'copy') {
|
|
15466
|
+
if (step.copyerDtoList && step.copyerDtoList.length) {
|
|
15467
|
+
defaultKey = step.copyerDtoList.map(item => {
|
|
15468
|
+
return {
|
|
15469
|
+
key: item.userId,
|
|
15470
|
+
name: item.name,
|
|
15471
|
+
type: "USER"
|
|
15472
|
+
};
|
|
15473
|
+
});
|
|
15474
|
+
}
|
|
15475
|
+
} else {
|
|
15476
|
+
if (step.approverDtoList && step.approverDtoList.length) {
|
|
15477
|
+
defaultKey = step.approverDtoList.map(item => {
|
|
15478
|
+
return {
|
|
15479
|
+
key: item.userId,
|
|
15480
|
+
name: item.name,
|
|
15481
|
+
type: "USER"
|
|
15482
|
+
};
|
|
15483
|
+
});
|
|
15484
|
+
}
|
|
15464
15485
|
}
|
|
15465
15486
|
let myTree2 = new approveMobileTree({
|
|
15466
15487
|
unitType: "user",
|
|
@@ -15501,7 +15522,11 @@ approveMobileTree.prototype = {
|
|
|
15501
15522
|
});
|
|
15502
15523
|
console.log("userList", userList);
|
|
15503
15524
|
//添加人员到节点中
|
|
15504
|
-
|
|
15525
|
+
if (node.nodeType == 'copy') {
|
|
15526
|
+
step.copyerDtoList = userList;
|
|
15527
|
+
} else {
|
|
15528
|
+
step.approverDtoList = userList;
|
|
15529
|
+
}
|
|
15505
15530
|
//删除相同节点人员
|
|
15506
15531
|
me.optionalList = me.optionalList.filter(it => !it.nodeId == node.id);
|
|
15507
15532
|
//保存修改人员
|
|
@@ -15692,10 +15717,10 @@ approveMobileTree.prototype = {
|
|
|
15692
15717
|
});
|
|
15693
15718
|
;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=script&lang=js
|
|
15694
15719
|
/* harmony default export */ var components_approveLineAllvue_type_script_lang_js = (approveLineAllvue_type_script_lang_js);
|
|
15695
|
-
;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-54.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-54.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-54.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=style&index=0&id=
|
|
15720
|
+
;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-54.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-54.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-54.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=style&index=0&id=6fae4198&prod&scoped=true&lang=css
|
|
15696
15721
|
// extracted by mini-css-extract-plugin
|
|
15697
15722
|
|
|
15698
|
-
;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=
|
|
15723
|
+
;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=6fae4198&prod&scoped=true&lang=css
|
|
15699
15724
|
|
|
15700
15725
|
;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
|
|
15701
15726
|
|
|
@@ -15708,11 +15733,11 @@ approveMobileTree.prototype = {
|
|
|
15708
15733
|
|
|
15709
15734
|
var approveLineAll_component = normalizeComponent(
|
|
15710
15735
|
components_approveLineAllvue_type_script_lang_js,
|
|
15711
|
-
|
|
15712
|
-
|
|
15736
|
+
approveLineAllvue_type_template_id_6fae4198_scoped_true_render,
|
|
15737
|
+
approveLineAllvue_type_template_id_6fae4198_scoped_true_staticRenderFns,
|
|
15713
15738
|
false,
|
|
15714
15739
|
null,
|
|
15715
|
-
"
|
|
15740
|
+
"6fae4198",
|
|
15716
15741
|
null
|
|
15717
15742
|
|
|
15718
15743
|
)
|