saas-tenant-approve-app 0.2.42 → 0.2.43

package/lib/tips.common.js

@@ -14742,6 +14742,13 @@ function projectCustomNodes(baseurl, data) {
     data
   });
 }
+function queryOptionalScopeUsers(baseurl, data) {
+  return service({
+    url: baseurl + '/work/queryOptionalScopeUsers',
+    method: 'POST',
+    data
+  });
+}
 // 指定标签查询人员
 function queryTSysUserRoleList(baseurl, data) {
   return service({
@@ -14896,6 +14903,9 @@ approveMobileTree.prototype = {
   roterData: [],
   allData: [],
   init: function () {
+    // Inline tree handlers must use the constructor that opened this picker.
+    approveMobileTree.prototype.previousGlobalConstructor = window.approveMobileTree;
+    window.approveMobileTree = approveMobileTree;
     approveMobileTree.prototype.options = this.options;
     approveMobileTree.prototype.nodesMap = this.options.defaultKey ? this.options.defaultKey : [];
 
@@ -15130,6 +15140,10 @@ approveMobileTree.prototype = {
   //取消组织树
   cancleTree: function () {
     $(".deptUserTree").remove();
+    if (window.approveMobileTree === approveMobileTree) {
+      window.approveMobileTree = approveMobileTree.prototype.previousGlobalConstructor || approveMobileTree;
+    }
+    delete approveMobileTree.prototype.previousGlobalConstructor;
   },
   showCheck: function () {
     var defaultKey = approveMobileTree.prototype.nodesMap;
@@ -15744,8 +15758,8 @@ var approveLineAll_component = normalizeComponent(
 )
 
 /* 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=9eacb8b4
-var selectLinevue_type_template_id_9eacb8b4_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=59bf336a
+var selectLinevue_type_template_id_59bf336a_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15767,7 +15781,7 @@ var selectLinevue_type_template_id_9eacb8b4_render = function render() {
       staticClass: "per_p1"
     }, [_vm._v(" " + _vm._s(node.name) + " ")]), _c('div', [_vm._l(node.list, function (per) {
       return _c('van-button', {
-        key: per.id,
+        key: per.userId,
         staticClass: "per_name",
         attrs: {
           "type": "primary",
@@ -15844,7 +15858,7 @@ var selectLinevue_type_template_id_9eacb8b4_render = function render() {
     }
   }, [_c('van-cell-group', _vm._l(_vm.personList, function (item, index) {
     return _c('van-cell', {
-      key: item.id,
+      key: item.userId,
       attrs: {
         "title": item.name,
         "clickable": ""
@@ -15876,7 +15890,7 @@ var selectLinevue_type_template_id_9eacb8b4_render = function render() {
     }
   }, [_c('van-cell-group', _vm._l(_vm.personList, function (item, index) {
     return _c('van-cell', {
-      key: item.id,
+      key: item.userId,
       attrs: {
         "clickable": "",
         "title": item.name
@@ -15902,13 +15916,29 @@ var selectLinevue_type_template_id_9eacb8b4_render = function render() {
     });
   }), 1)], 1)], 1)])], 1);
 };
-var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
-
+var selectLinevue_type_template_id_59bf336a_staticRenderFns = [];
+
+;// CONCATENATED MODULE: ./src/utils/selectionScope.js
+const isCopyScope = node => node && node.type === 'copy' && node.checker && String(node.checker.isOptional) === '1' && String(node.checker.selectArea) === '2' && (Number(node.checker.scopeVersion) === 1 || (node.checker.selectedDepts || []).length > 0);
+const isScopedSelection = node => isCopyScope(node) || node && node.type === 'check' && node.checker && [7, 8].includes(Number(node.checker.type)) && String(node.checker.selectArea) === '2' && (Number(node.checker.scopeVersion) === 1 || (node.checker.selectedDepts || []).length > 0);
+function normalizeCandidates(people) {
+  const unique = new Map();
+  for (const person of people || []) {
+    if (!person || String(person.type) === '2') continue;
+    const userId = person.userId || person.id;
+    if (userId) unique.set(String(userId), {
+      userId: String(userId),
+      name: person.name
+    });
+  }
+  return [...unique.values()];
+}
 ;// 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
 
 
 
 
+
 /* harmony default export */ var selectLinevue_type_script_lang_js = ({
   name: "SelectLine",
   props: {
@@ -15937,7 +15967,8 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
       showBtn: false,
       showdialog: false,
       selectPersonType: 1,
-      preNode: null
+      preNode: null,
+      scopeLoading: false
     };
   },
   mounted() {
@@ -16039,6 +16070,8 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
                 roleList.push(tag.id);
               });
             }
+            const copyRoleDefaults = isCopyScope(item) && item.checker.defaultApprover == 1 && roleList.length > 0;
+            let scopedRoleDefaults = [];
             // 245.指定部门中带指定标签，查getPreCheckersByNode查
             if (item.checker.type == 2 || item.checker.type == 4 || item.checker.type == 5) {
               let res = await getPreCheckersByNode(that.SAAS_TENANT_API, {
@@ -16063,7 +16096,7 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
               }
             }
             // 9.部门标签自选，查getDeptRoleUsers接口选，10仅展示
-            if (item.checker.type == 9 || item.checker.type == 10 || item.checker.type == 11 || item.type == "copy" && item.checker.isOptional && item.checker.isOptional == '1') {
+            if (item.checker.type == 9 || item.checker.type == 10 || item.checker.type == 11 || copyRoleDefaults || item.type == "copy" && item.checker.isOptional && item.checker.isOptional == '1' && !isCopyScope(item)) {
               let res = await getDeptRoleUsers(that.SAAS_TENANT_API, {
                 uid: that.data.uid,
                 roleList,
@@ -16074,12 +16107,18 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
               });
               if (res.status == 200) {
                 list = res.result.data;
+                if (copyRoleDefaults) {
+                  const allowed = new Set(normalizeCandidates(item.checker.selectedPersons).map(person => person.userId));
+                  scopedRoleDefaults = normalizeCandidates(list).filter(person => allowed.has(person.userId));
+                }
               }
             }
             // 789选人节点，默认审批人为否，不回填
             if (([7, 8, 9].includes(item.checker.type) || item.type == "copy" && item.checker.isOptional && item.checker.isOptional == '1') && item.checker.defaultApprover != 1) {
               list = [];
             }
+            // Only department role holders inside the configured range may be preselected.
+            if (isCopyScope(item)) list = scopedRoleDefaults;
             return {
               id: item.id,
               type: item.type,
@@ -16118,21 +16157,39 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
         return false;
       }
     },
-    addApprover(node) {
+    async addApprover(node) {
       let me = this;
-      if ((node.checker.type == 7 || node.checker.type == 8) && node.checker.selectArea == 2 && node.checker.selectedPersons && node.checker.selectedPersons.length > 0) {
-        //申请人自选，审批人自选
-        me.personList = [];
+      const scoped = isScopedSelection(node);
+      if (me.scopeLoading) return;
+      if (scoped || (node.checker.type == 7 || node.checker.type == 8) && node.checker.selectArea == 2 && node.checker.selectedPersons && node.checker.selectedPersons.length > 0) {
+        let candidates = normalizeCandidates(node.checker.selectedPersons);
+        if (scoped && (me.data.aprId || me.data.id)) {
+          me.scopeLoading = true;
+          try {
+            const response = await queryOptionalScopeUsers(me.SAAS_TENANT_API, {
+              aprId: me.data.aprId,
+              recordId: me.data.id,
+              nodeId: node.id
+            });
+            if (Number(response.status) !== 200 || !Array.isArray(response.result && response.result.data)) throw new Error(response.message || '读取可选范围失败，请重试');
+            candidates = normalizeCandidates(response.result.data);
+          } catch (error) {
+            toast.fail(error.message || '读取可选范围失败，请重试');
+            return;
+          } finally {
+            me.scopeLoading = false;
+          }
+        }
+        if (!candidates.length) {
+          toast.fail('指定范围暂无可选人员，请联系流程管理员');
+          return;
+        }
+        me.clearDialogData();
         me.selectPersonType = node.selectPersonType;
         me.preNode = node;
-        node.checker.selectedPersons.forEach(item => {
-          me.personList.push({
-            userId: item.id,
-            name: item.name,
-            id: node.id,
-            type: node.type
-          });
-        });
+        me.personList = candidates;
+        me.radioSelect = node.list[0] && node.list[0].userId;
+        me.checkBoxList = node.list.map(item => item.userId);
         me.showdialog = true;
       } else {
         let defaultKey = [];
@@ -16186,7 +16243,7 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
       let submitFlag = true;
       let optionalUserList = [];
       this.approveList.forEach(item => {
-        if ([7, 8, 9].includes(item.checkertype)) {
+        if (item.type === 'check' && [7, 8, 9].includes(item.checkertype)) {
           if (item.list && item.list.length) {
             if (item.selectPersonType == 1 && item.list.length > 1 && item.editApprover == 1) {
               toast.fail(`${item.name}只可选择一个审批人`);
@@ -16207,6 +16264,11 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
             return;
           }
         } else if ('copy' == item.type) {
+          if (isCopyScope(item) && item.selectPersonType == 1 && new Set((item.list || []).map(person => person.userId)).size > 1) {
+            submitFlag = false;
+            toast.fail(item.name + '只可选择一个抄送人');
+            return;
+          }
           if (item.checker.allowISNull != '1' && (!item.list || item.list.length == 0)) {
             submitFlag = false;
             toast.fail(item.name + "节点不能为空");
@@ -16233,10 +16295,10 @@ var selectLinevue_type_template_id_9eacb8b4_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=9eacb8b4&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=59bf336a&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=9eacb8b4&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=59bf336a&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16249,8 +16311,8 @@ var selectLinevue_type_template_id_9eacb8b4_staticRenderFns = [];
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_9eacb8b4_render,
-  selectLinevue_type_template_id_9eacb8b4_staticRenderFns,
+  selectLinevue_type_template_id_59bf336a_render,
+  selectLinevue_type_template_id_59bf336a_staticRenderFns,
   false,
   null,
   null,