saas-tenant-approve-app 0.1.21 → 0.1.23

package/lib/tips.common.js

@@ -7337,7 +7337,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACO
 "use strict";
 
 var isCallable = __webpack_require__(4901);
-var tryToString = __webpack_require__(6823);
+var tryToString = __webpack_require__(9204);
 
 var $TypeError = TypeError;
 
@@ -7525,7 +7525,7 @@ var isCallable = __webpack_require__(4901);
 var isObject = __webpack_require__(34);
 var hasOwn = __webpack_require__(9297);
 var classof = __webpack_require__(6955);
-var tryToString = __webpack_require__(6823);
+var tryToString = __webpack_require__(9204);
 var createNonEnumerableProperty = __webpack_require__(6699);
 var defineBuiltIn = __webpack_require__(6840);
 var defineBuiltInAccessor = __webpack_require__(2106);
@@ -9687,7 +9687,7 @@ module.exports = function (name) {
 
 /***/ }),
 
-/***/ 6823:
+/***/ 9204:
 /***/ (function(module) {
 
 "use strict";
@@ -14478,8 +14478,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/selectLine.vue?vue&type=template&id=6c46dece
-var selectLinevue_type_template_id_6c46dece_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=b21a699e
+var selectLinevue_type_template_id_b21a699e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14554,7 +14554,7 @@ var selectLinevue_type_template_id_6c46dece_render = function render() {
     }
   }, [_vm._v(" 提交 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var selectLinevue_type_template_id_6c46dece_staticRenderFns = [];
+var selectLinevue_type_template_id_b21a699e_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./src/components/mobiletree/http.js
 
@@ -15183,7 +15183,7 @@ function getDeptRoleUsers(baseurl, data) {
         if (res.status == 200 && res.result && res.result.data) {
           that.showBtn = true;
           let approveList = res.result.data.map(async (item, index) => {
-            let list = JSON.parse(JSON.stringify(item.checker.selectedPersons));
+            let list = JSON.parse(JSON.stringify(item.checker.selectedPersons)) || [];
             if (list && list.length) {
               list.forEach(item => {
                 if (!item.userId && item.id) item.userId = item.id;
@@ -15195,14 +15195,18 @@ function getDeptRoleUsers(baseurl, data) {
                 roleList.push(tag.id);
               });
             }
-            // 5.指定部门中带指定标签，查getPreCheckersByNode查
-            if (item.checker.type == 2 || item.checker.type == 4 || item.checker.type == 5) {
+            // 245.指定部门中带指定标签，查getPreCheckersByNode查
+            if (item.checker.type == 2 || item.checker.type == 4 || item.checker.type == 5 || item.type == "copy" && item.checker.selectedTags) {
               let res = await getPreCheckersByNode(that.SAAS_TENANT_API, {
                 userId: that.data.uid,
                 jsonNode: JSON.stringify(item)
               });
               if (res.status == 200) {
-                list = res.result.data;
+                if (item.type == "copy") {
+                  list.push(...res.result.data);
+                } else {
+                  list = res.result.data;
+                }
               }
             }
             //  3.指定标签,查询queryTSysUserRoleList
@@ -15228,7 +15232,8 @@ function getDeptRoleUsers(baseurl, data) {
                 list = res.result.data;
               }
             }
-            if ([7, 8, 9].includes(item.checker.type) && item.checker.defaultApprover == 1) {
+            // 789选人节点，默认审批人为否，不回填
+            if ([7, 8, 9].includes(item.checker.type) && item.checker.defaultApprover != 1) {
               list = [];
             }
             return {
@@ -15241,6 +15246,7 @@ function getDeptRoleUsers(baseurl, data) {
               defaultApprover: item.checker.defaultApprover,
               editApprover: item.checker.editApprover,
               selectedPersons: item.checker.selectedPersons,
+              isOptional: item.checker.isOptional,
               list
             };
           });
@@ -15257,7 +15263,7 @@ function getDeptRoleUsers(baseurl, data) {
       });
     },
     ableEdit(node) {
-      if ([7, 8, 9].includes(node.checkertype) && node.editApprover == 1) {
+      if ([7, 8, 9].includes(node.checkertype) && node.editApprover == 1 || node.type == "copy" && node.isOptional == 1) {
         return true;
       } else {
         return false;
@@ -15347,10 +15353,10 @@ function getDeptRoleUsers(baseurl, data) {
 });
 ;// 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=6c46dece&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=b21a699e&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=6c46dece&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=b21a699e&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -15363,8 +15369,8 @@ function getDeptRoleUsers(baseurl, data) {
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_6c46dece_render,
-  selectLinevue_type_template_id_6c46dece_staticRenderFns,
+  selectLinevue_type_template_id_b21a699e_render,
+  selectLinevue_type_template_id_b21a699e_staticRenderFns,
   false,
   null,
   null,