saas-tenant-approve-app 0.2.20 → 0.2.23

package/lib/tips.common.js

@@ -14485,8 +14485,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var approveLine = (component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.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=79c4d0e4&scoped=true
-var approveLineAllvue_type_template_id_79c4d0e4_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.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
+var approveLineAllvue_type_template_id_6fae4198_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14573,6 +14573,10 @@ var approveLineAllvue_type_template_id_79c4d0e4_scoped_true_render = function re
         "type": "primary"
       }
     }, [_vm._v("依次")]) : _vm._e(), _vm.ableEdit(step) && _vm.data.editApprover && step.unApprovedFlag ? _c('van-button', {
+      staticStyle: {
+        "position": "relative",
+        "top": "-4px"
+      },
       attrs: {
         "icon": "plus",
         "size": "mini",
@@ -14687,7 +14691,7 @@ var approveLineAllvue_type_template_id_79c4d0e4_scoped_true_render = function re
     }
   }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var approveLineAllvue_type_template_id_79c4d0e4_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_6fae4198_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -15332,11 +15336,16 @@ approveMobileTree.prototype = {
     },
     async getProjectNodes() {
       let that = this;
+      let formDataList = [{
+        lable: "部门主要负责人",
+        value: that.data.mainDeptLeader ? "是" : "否"
+      }];
       projectCustomNodes(that.SAAS_TENANT_API, {
         outApprove: true,
         uid: that.data.uid,
         id: that.data.id,
-        aprId: that.data.aprId
+        aprId: that.data.aprId,
+        formDataList: formDataList
       }).then(async res => {
         if (res.status == 200 && res.result && res.result.data) {
           let approveList = res.result.data.map(async (item, index) => {
@@ -15435,14 +15444,26 @@ approveMobileTree.prototype = {
       if (me.approveList && me.approveList.length > 0) {
         var node = me.approveList.find(item => item.id == step.nodeId);
         let defaultKey = [];
-        if (step.approverDtoList.length) {
-          defaultKey = step.approverDtoList.map(item => {
-            return {
-              key: item.userId,
-              name: item.name,
-              type: "USER"
-            };
-          });
+        if (node.nodeType == 'copy') {
+          if (step.copyerDtoList && step.copyerDtoList.length) {
+            defaultKey = step.copyerDtoList.map(item => {
+              return {
+                key: item.userId,
+                name: item.name,
+                type: "USER"
+              };
+            });
+          }
+        } else {
+          if (step.approverDtoList && step.approverDtoList.length) {
+            defaultKey = step.approverDtoList.map(item => {
+              return {
+                key: item.userId,
+                name: item.name,
+                type: "USER"
+              };
+            });
+          }
         }
         let myTree2 = new approveMobileTree({
           unitType: "user",
@@ -15483,7 +15504,11 @@ approveMobileTree.prototype = {
           });
           console.log("userList", userList);
           //添加人员到节点中
-          step.approverDtoList = userList;
+          if (node.nodeType == 'copy') {
+            step.copyerDtoList = userList;
+          } else {
+            step.approverDtoList = userList;
+          }
           //删除相同节点人员
           me.optionalList = me.optionalList.filter(it => !it.nodeId == node.id);
           //保存修改人员
@@ -15674,10 +15699,10 @@ approveMobileTree.prototype = {
 });
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=script&lang=js
  /* harmony default export */ var components_approveLineAllvue_type_script_lang_js = (approveLineAllvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=style&index=0&id=79c4d0e4&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.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
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=79c4d0e4&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=6fae4198&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -15690,18 +15715,18 @@ approveMobileTree.prototype = {
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_79c4d0e4_scoped_true_render,
-  approveLineAllvue_type_template_id_79c4d0e4_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_6fae4198_scoped_true_render,
+  approveLineAllvue_type_template_id_6fae4198_scoped_true_staticRenderFns,
   false,
   null,
-  "79c4d0e4",
+  "6fae4198",
   null
   
 )
 
 /* harmony default export */ var approveLineAll = (approveLineAll_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.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/selectLine.vue?vue&type=template&id=fb584a8c
-var selectLinevue_type_template_id_fb584a8c_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.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/selectLine.vue?vue&type=template&id=d4fcd176
+var selectLinevue_type_template_id_d4fcd176_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15776,7 +15801,7 @@ var selectLinevue_type_template_id_fb584a8c_render = function render() {
     }
   }, [_vm._v(" 提交 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var selectLinevue_type_template_id_fb584a8c_staticRenderFns = [];
+var selectLinevue_type_template_id_d4fcd176_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/selectLine.vue?vue&type=script&lang=js
 
@@ -16008,6 +16033,21 @@ var selectLinevue_type_template_id_fb584a8c_staticRenderFns = [];
             toast.fail("请完整选择所有审批人");
             return;
           }
+        } else if ('copy' == item.type) {
+          if (item.list && item.list.length > 0) {
+            item.list.forEach(li => {
+              optionalUserList.push({
+                id: item.id,
+                type: item.type,
+                name: li.name,
+                userId: li.userId
+              });
+            });
+          } else {
+            submitFlag = false;
+            toast.fail("请选择抄送节点人员");
+            return;
+          }
         }
       });
       if (!submitFlag) {
@@ -16020,10 +16060,10 @@ var selectLinevue_type_template_id_fb584a8c_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=script&lang=js
  /* harmony default export */ var components_selectLinevue_type_script_lang_js = (selectLinevue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/selectLine.vue?vue&type=style&index=0&id=fb584a8c&prod&lang=css
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/selectLine.vue?vue&type=style&index=0&id=d4fcd176&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=fb584a8c&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=d4fcd176&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16036,8 +16076,8 @@ var selectLinevue_type_template_id_fb584a8c_staticRenderFns = [];
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_fb584a8c_render,
-  selectLinevue_type_template_id_fb584a8c_staticRenderFns,
+  selectLinevue_type_template_id_d4fcd176_render,
+  selectLinevue_type_template_id_d4fcd176_staticRenderFns,
   false,
   null,
   null,