saas-tenant-approve-app 0.2.44 → 0.2.46

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=0171b230&scoped=true
-var approveLineAllvue_type_template_id_0171b230_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=520f8838&scoped=true
+var approveLineAllvue_type_template_id_520f8838_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14587,7 +14587,9 @@ var approveLineAllvue_type_template_id_0171b230_scoped_true_render = function re
           return _vm.addApprover(step);
         }
       }
-    }) : _vm._e()], 1), step.approverDtoList && step.approverDtoList.length ? _vm._l(step.approverDtoList, function (item, index2) {
+    }) : _vm._e(), _vm._t("node-actions", null, {
+      "step": step
+    })], 2), _vm.visibleApprovers(step).length ? _vm._l(_vm.visibleApprovers(step), function (item, index2) {
       return _c('span', {
         key: item.id
       }, [_c('div', {
@@ -14689,9 +14691,26 @@ var approveLineAllvue_type_template_id_0171b230_scoped_true_render = function re
     on: {
       "click": _vm.agre_vis
     }
-  }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
+  }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e(), _c('CandidatePicker', {
+    attrs: {
+      "candidates": _vm.rangeCandidates,
+      "selected": _vm.rangeSelected,
+      "single": _vm.rangeSingle,
+      "required": _vm.rangeRequired
+    },
+    on: {
+      "confirm": _vm.confirmRange
+    },
+    model: {
+      value: _vm.rangeVisible,
+      callback: function ($$v) {
+        _vm.rangeVisible = $$v;
+      },
+      expression: "rangeVisible"
+    }
+  })], 1);
 };
-var approveLineAllvue_type_template_id_0171b230_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_520f8838_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -15274,6 +15293,304 @@ approveMobileTree.prototype = {
 };
 
 // export default approveMobileTree
+;// 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/CandidatePicker.vue?vue&type=template&id=3d2a46fc&scoped=true
+var CandidatePickervue_type_template_id_3d2a46fc_scoped_true_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _c('van-dialog', {
+    attrs: {
+      "value": _vm.value,
+      "title": "选择人员",
+      "show-cancel-button": "",
+      "before-close": _vm.beforeClose
+    }
+  }, [_c('van-search', {
+    attrs: {
+      "placeholder": "搜索姓名或账号"
+    },
+    model: {
+      value: _vm.keyword,
+      callback: function ($$v) {
+        _vm.keyword = $$v;
+      },
+      expression: "keyword"
+    }
+  }), _c('div', {
+    staticClass: "approval-candidate-list"
+  }, [_vm._l(_vm.filtered, function (person) {
+    return _c('van-cell', {
+      key: person.userId,
+      attrs: {
+        "title": person.name,
+        "label": person.userId,
+        "clickable": ""
+      },
+      on: {
+        "click": function ($event) {
+          return _vm.toggle(person.userId);
+        }
+      },
+      scopedSlots: _vm._u([{
+        key: "right-icon",
+        fn: function () {
+          return [_c('van-icon', {
+            attrs: {
+              "name": _vm.chosen.includes(person.userId) ? 'checked' : 'circle',
+              "color": _vm.chosen.includes(person.userId) ? '#009b80' : '#ccc'
+            }
+          })];
+        },
+        proxy: true
+      }], null, true)
+    });
+  }), !_vm.filtered.length ? _c('p', {
+    staticClass: "approval-candidate-empty",
+    attrs: {
+      "role": "status"
+    }
+  }, [_vm._v("当前范围暂无可选人员")]) : _vm._e()], 2)], 1);
+};
+var CandidatePickervue_type_template_id_3d2a46fc_scoped_true_staticRenderFns = [];
+
+;// CONCATENATED MODULE: ./node_modules/vant/es/search/index.js
+
+
+
+// Utils
+
+
+ // Components
+
+ // Types
+
+var search_createNamespace = createNamespace('search'),
+  search_createComponent = search_createNamespace[0],
+  search_bem = search_createNamespace[1],
+  search_t = search_createNamespace[2];
+function Search(h, props, slots, ctx) {
+  function Label() {
+    if (slots.label || props.label) {
+      return h("div", {
+        "class": search_bem('label')
+      }, [slots.label ? slots.label() : props.label]);
+    }
+  }
+  function Action() {
+    if (!props.showAction) {
+      return;
+    }
+    function onCancel() {
+      if (slots.action) {
+        return;
+      }
+      emit(ctx, 'input', '');
+      emit(ctx, 'cancel');
+    }
+    return h("div", {
+      "class": search_bem('action'),
+      "attrs": {
+        "role": "button",
+        "tabindex": "0"
+      },
+      "on": {
+        "click": onCancel
+      }
+    }, [slots.action ? slots.action() : props.actionText || search_t('cancel')]);
+  }
+  var fieldData = {
+    attrs: ctx.data.attrs,
+    on: _extends({}, ctx.listeners, {
+      keypress: function keypress(event) {
+        // press enter
+        if (event.keyCode === 13) {
+          preventDefault(event);
+          emit(ctx, 'search', props.value);
+        }
+        emit(ctx, 'keypress', event);
+      }
+    })
+  };
+  var inheritData = inherit(ctx);
+  inheritData.attrs = undefined;
+  return h("div", helper_default()([{
+    "class": search_bem({
+      'show-action': props.showAction
+    }),
+    "style": {
+      background: props.background
+    }
+  }, inheritData]), [slots.left == null ? void 0 : slots.left(), h("div", {
+    "class": search_bem('content', props.shape)
+  }, [Label(), h(field, helper_default()([{
+    "attrs": {
+      "type": "search",
+      "border": false,
+      "value": props.value,
+      "leftIcon": props.leftIcon,
+      "rightIcon": props.rightIcon,
+      "clearable": props.clearable,
+      "clearTrigger": props.clearTrigger
+    },
+    "scopedSlots": {
+      'left-icon': slots['left-icon'],
+      'right-icon': slots['right-icon']
+    }
+  }, fieldData]))]), Action()]);
+}
+Search.props = {
+  value: String,
+  label: String,
+  rightIcon: String,
+  actionText: String,
+  background: String,
+  showAction: Boolean,
+  clearTrigger: String,
+  shape: {
+    type: String,
+    default: 'square'
+  },
+  clearable: {
+    type: Boolean,
+    default: true
+  },
+  leftIcon: {
+    type: String,
+    default: 'search'
+  }
+};
+/* harmony default export */ var search = (search_createComponent(Search));
+;// 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()];
+}
+const isSelectableApproval = node => node && node.type === 'check' && node.checker && [7, 8, 9].includes(Number(node.checker.type));
+const hasCandidateRange = node => Boolean(node && node.selectionRestricted === true) || isScopedSelection(node);
+
+// Each node is a complete selection. The immediate-node callback wins only for that node.
+function mergeOptionalSelections(edited, immediate) {
+  const parse = value => typeof value === 'string' ? JSON.parse(value || '[]') : value || [];
+  const next = parse(immediate);
+  const replaced = new Set(next.map(person => String(person.nodeId || person.id)));
+  return parse(edited).filter(person => !replaced.has(String(person.nodeId || person.id))).concat(next);
+}
+function constrainDefaults(node, people) {
+  if (!node || node.approvalControlsEnabled !== true || node.selectionRestricted !== true) return people;
+  const allowed = new Set(normalizeCandidates(node.selectionCandidates).map(p => p.userId));
+  return normalizeCandidates(people).filter(p => allowed.has(p.userId));
+}
+const canChangeFutureApprovers = node => Boolean(node) && !(node.approvalControlsEnabled === true && (node.type !== 'check' || node.checker.lockApproverChanges === true)) && canEditApprovers(node);
+const canEditApprovers = node => isSelectableApproval(node) ? String(node.checker.editApprover) === '1' : node && node.type === 'copy' && String(node.isOptional) === '1';
+const canReduceDefaultApprovers = node => isSelectableApproval(node) && String(node.checker.editApprover) !== '1' && String(node.checker.defaultApprover) === '1' && String(node.checker.allowRemoveDefaultApprover) === '1';
+const canRemoveApprover = node => (canEditApprovers(node) || canReduceDefaultApprovers(node)) && (node.type !== 'check' || normalizeCandidates(node.list).length > 1);
+function approvalSelectionError(node, people = node.list) {
+  if (!isSelectableApproval(node)) return '';
+  const selected = normalizeCandidates(people);
+  if (!selected.length) return '至少保留一位审批人';
+  if (canEditApprovers(node) && String(node.checker.selectPersonType) === '1' && selected.length > 1) return node.name + '只可选择一个审批人';
+  if (!canEditApprovers(node) && String(node.checker.defaultApprover) === '1') {
+    const defaults = new Set(node.defaultApproverIds || []);
+    if (selected.some(person => !defaults.has(person.userId))) return node.name + '只能保留默认审批人';
+    if (!canReduceDefaultApprovers(node) && selected.length !== defaults.size) return node.name + '不允许删减默认审批人';
+  }
+  return '';
+}
+;// 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/CandidatePicker.vue?vue&type=script&lang=js
+
+
+/* harmony default export */ var CandidatePickervue_type_script_lang_js = ({
+  name: 'CandidatePicker',
+  components: {
+    'van-dialog': dialog.Component,
+    'van-search': search,
+    'van-cell': cell,
+    'van-icon': es_icon
+  },
+  props: {
+    value: Boolean,
+    candidates: Array,
+    selected: Array,
+    single: Boolean,
+    required: Boolean
+  },
+  data: () => ({
+    keyword: '',
+    chosen: []
+  }),
+  computed: {
+    people() {
+      return normalizeCandidates(this.candidates);
+    },
+    filtered() {
+      const text = this.keyword.trim().toLowerCase();
+      return this.people.filter(p => !text || (p.name + ' ' + p.userId).toLowerCase().includes(text));
+    }
+  },
+  watch: {
+    value(open) {
+      if (!open) return;
+      this.keyword = '';
+      const allowed = new Set(this.people.map(p => p.userId));
+      this.chosen = normalizeCandidates(this.selected).map(p => p.userId).filter(id => allowed.has(id));
+      if (this.single) this.chosen = this.chosen.slice(0, 1);
+    }
+  },
+  methods: {
+    toggle(id) {
+      this.chosen = this.single ? [id] : this.chosen.includes(id) ? this.chosen.filter(value => value !== id) : [...this.chosen, id];
+    },
+    beforeClose(action, done) {
+      if (action === 'confirm') {
+        if (this.required && !this.chosen.length) {
+          toast.fail('至少保留一位审批人');
+          done(false);
+          return;
+        }
+        this.$emit('confirm', this.people.filter(p => this.chosen.includes(p.userId)));
+      }
+      this.$emit('input', false);
+      done();
+    }
+  }
+});
+;// CONCATENATED MODULE: ./src/components/CandidatePicker.vue?vue&type=script&lang=js
+ /* harmony default export */ var components_CandidatePickervue_type_script_lang_js = (CandidatePickervue_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/CandidatePicker.vue?vue&type=style&index=0&id=3d2a46fc&prod&scoped=true&lang=css
+// extracted by mini-css-extract-plugin
+
+;// CONCATENATED MODULE: ./src/components/CandidatePicker.vue?vue&type=style&index=0&id=3d2a46fc&prod&scoped=true&lang=css
+
+;// CONCATENATED MODULE: ./src/components/CandidatePicker.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var CandidatePicker_component = normalizeComponent(
+  components_CandidatePickervue_type_script_lang_js,
+  CandidatePickervue_type_template_id_3d2a46fc_scoped_true_render,
+  CandidatePickervue_type_template_id_3d2a46fc_scoped_true_staticRenderFns,
+  false,
+  null,
+  "3d2a46fc",
+  null
+  
+)
+
+/* harmony default export */ var CandidatePicker = (CandidatePicker_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/index.js??vue-loader-options!./src/components/approveLineAll.vue?vue&type=script&lang=js
 
 
@@ -15281,6 +15598,8 @@ approveMobileTree.prototype = {
 
 
 
+
+
 /* harmony default export */ var approveLineAllvue_type_script_lang_js = ({
   name: "ApproveLineAll",
   data() {
@@ -15295,7 +15614,15 @@ approveMobileTree.prototype = {
       //是否登录人有权限操作 同意驳回 true：有
       ifBtn: true,
       approveList: [],
-      optionalList: []
+      optionalList: [],
+      rangeVisible: false,
+      rangeCandidates: [],
+      rangeSelected: [],
+      rangeSingle: false,
+      rangeRequired: true,
+      rangeNode: null,
+      rangeStep: null,
+      rangeLoading: false
     };
   },
   props: {
@@ -15305,6 +15632,7 @@ approveMobileTree.prototype = {
     }
   },
   components: {
+    CandidatePicker: CandidatePicker,
     "van-steps": steps,
     "van-step": step,
     "van-tag": tag,
@@ -15357,10 +15685,11 @@ approveMobileTree.prototype = {
           value: that.data.mainDeptLeader ? "是" : "否"
         }];
       }
-      projectCustomNodes(that.SAAS_TENANT_API, {
+      return projectCustomNodes(that.SAAS_TENANT_API, {
         outApprove: true,
         uid: that.data.uid,
         id: that.data.id,
+        projectId: that.data.projectId,
         aprId: that.data.aprId,
         formDataList: formDataList
       }).then(async res => {
@@ -15419,7 +15748,11 @@ approveMobileTree.prototype = {
             if ([7, 8, 9].includes(item.checker.type) && item.checker.defaultApprover != 1) {
               list = [];
             }
+            list = constrainDefaults(item, list);
             return {
+              selectionRestricted: item.selectionRestricted,
+              selectionCandidates: item.selectionCandidates,
+              approvalControlsEnabled: item.approvalControlsEnabled,
               id: item.id,
               type: item.type,
               name: item.name,
@@ -15433,7 +15766,7 @@ approveMobileTree.prototype = {
               list: this.uniqueByUserId(list)
             };
           });
-          Promise.all(approveList).then(res => {
+          return Promise.all(approveList).then(res => {
             this.approveList = res;
           });
         } else {
@@ -15449,6 +15782,8 @@ approveMobileTree.prototype = {
       var me = this;
       if (me.approveList && me.approveList.length > 0) {
         var node = me.approveList.find(item => item.id == step.nodeId);
+        if (!node) return false;
+        if (node.approvalControlsEnabled === true) return me.approveStatus && canChangeFutureApprovers(node);
         if ([7, 8, 9].includes(node.checkertype) && node.editApprover == 1 || node.type == "copy" && node.isOptional == 1) {
           return true;
         } else {
@@ -15456,10 +15791,35 @@ approveMobileTree.prototype = {
         }
       }
     },
-    addApprover(step) {
+    async addApprover(step) {
       let me = this;
+      if (!this.ableEdit(step) || this.rangeLoading) return;
       if (me.approveList && me.approveList.length > 0) {
         var node = me.approveList.find(item => item.id == step.nodeId);
+        if (hasCandidateRange(node) || [7, 8].includes(Number(node.checkertype)) && String(node.checker.selectArea) === '2' && (node.selectedPersons || []).length) {
+          this.rangeLoading = true;
+          try {
+            const response = await queryOptionalScopeUsers(this.SAAS_TENANT_API, {
+              recordId: this.data.id,
+              projectId: this.data.projectId,
+              aprId: this.data.aprId,
+              nodeId: node.id
+            });
+            if (Number(response.status) !== 200 || !Array.isArray(response.result && response.result.data)) throw new Error(response.message || '读取可选范围失败');
+            this.rangeCandidates = normalizeCandidates(response.result.data);
+            this.rangeSelected = step.nodeType === 'copy' ? step.copyerDtoList : step.approverDtoList;
+            this.rangeSingle = String(node.selectPersonType) === '1';
+            this.rangeRequired = step.nodeType === 'check';
+            this.rangeNode = node;
+            this.rangeStep = step;
+            this.rangeVisible = true;
+          } catch (error) {
+            toast.fail(error.message || '读取可选范围失败');
+          } finally {
+            this.rangeLoading = false;
+          }
+          return;
+        }
         let defaultKey = [];
         if (step.nodeType == 'copy') {
           if (step.copyerDtoList && step.copyerDtoList.length) {
@@ -15533,6 +15893,24 @@ approveMobileTree.prototype = {
         });
       }
     },
+    confirmRange(people) {
+      const node = this.rangeNode,
+        step = this.rangeStep;
+      if (!node || !step || !this.ableEdit(step)) return;
+      const list = people.map((person, sort) => ({
+        userId: person.userId,
+        name: person.name,
+        nodeId: node.id,
+        nodeName: node.name,
+        nodeType: node.type,
+        recordId: step.recordId,
+        isApprove: '0',
+        status: '1',
+        sort
+      }));
+      if (step.nodeType === 'copy') step.copyerDtoList = list;else step.approverDtoList = list;
+      this.optionalList = this.optionalList.filter(person => person.nodeId !== node.id).concat(list);
+    },
     async getInfo() {
       var that = this;
       let formDataList = null;
@@ -15607,6 +15985,14 @@ approveMobileTree.prototype = {
         console.log("that.approveStatus", that.approveStatus);
       });
     },
+    visibleApprovers(step) {
+      const people = step.approverDtoList || [];
+      if (this.data.hideReplacedPendingApprovers !== true) return people;
+      // Administrative replacement retains inactive rows for audit. Hide only
+      // explicitly invalid rows without an approval outcome. isApprove can be
+      // set in bulk when a node closes, including for previously replaced people.
+      return people.filter(person => !(String(person.status) === '0' && (person.approveStatus == null || String(person.approveStatus) === '1') && !person.approveTime && !person.result));
+    },
     uniqueByUserId(array) {
       return array.filter((item, index, arr) => {
         return arr.findIndex(it => it.userId === item.userId) === index;
@@ -15653,6 +16039,10 @@ approveMobileTree.prototype = {
           });
         }
         let optional = res.optional && res.optional.length > 0 ? res.optional : that.optionalList && that.optionalList.length > 0 ? JSON.stringify(that.optionalList) : null;
+        const controlsEnabled = that.approveList.some(node => node.approvalControlsEnabled === true);
+        if (controlsEnabled) {
+          optional = JSON.stringify(mergeOptionalSelections(that.optionalList, res.optional));
+        }
         let formDataList = null;
         if (that.data.editMainDeptLeader) {
           formDataList = [{
@@ -15668,6 +16058,7 @@ approveMobileTree.prototype = {
           optional: optional,
           formDataList: formDataList
         }, res);
+        if (controlsEnabled) parm.optional = optional;
         console.log(parm);
         if (!that.ifBtn) return;
         that.ifBtn = false;
@@ -15732,10 +16123,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=0171b230&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=520f8838&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=0171b230&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=520f8838&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -15748,18 +16139,18 @@ approveMobileTree.prototype = {
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_0171b230_scoped_true_render,
-  approveLineAllvue_type_template_id_0171b230_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_520f8838_scoped_true_render,
+  approveLineAllvue_type_template_id_520f8838_scoped_true_staticRenderFns,
   false,
   null,
-  "0171b230",
+  "520f8838",
   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=59bf336a
-var selectLinevue_type_template_id_59bf336a_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=1aa06fdd
+var selectLinevue_type_template_id_1aa06fdd_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15792,7 +16183,7 @@ var selectLinevue_type_template_id_59bf336a_render = function render() {
             return _vm.deleteApprover(node, per.userId);
           }
         }
-      }, [_vm._v(_vm._s(per.name) + " "), _vm.ableEdit(node) ? _c('van-icon', {
+      }, [_vm._v(_vm._s(per.name) + " "), _vm.canRemoveApprover(node) ? _c('van-icon', {
         staticClass: "badge-icon",
         attrs: {
           "name": "cross"
@@ -15848,6 +16239,23 @@ var selectLinevue_type_template_id_59bf336a_render = function render() {
       },
       expression: "showdialog"
     }
+  }, [_c('van-field', {
+    attrs: {
+      "placeholder": "搜索姓名或账号",
+      "clearable": ""
+    },
+    model: {
+      value: _vm.candidateKeyword,
+      callback: function ($$v) {
+        _vm.candidateKeyword = $$v;
+      },
+      expression: "candidateKeyword"
+    }
+  }), _c('div', {
+    staticStyle: {
+      "max-height": "55vh",
+      "overflow": "auto"
+    }
   }, [_vm.selectPersonType == 1 ? _c('div', [_c('van-radio-group', {
     model: {
       value: _vm.radioSelect,
@@ -15856,7 +16264,7 @@ var selectLinevue_type_template_id_59bf336a_render = function render() {
       },
       expression: "radioSelect"
     }
-  }, [_c('van-cell-group', _vm._l(_vm.personList, function (item, index) {
+  }, [_c('van-cell-group', _vm._l(_vm.filteredCandidates, function (item, index) {
     return _c('van-cell', {
       key: item.userId,
       attrs: {
@@ -15888,7 +16296,7 @@ var selectLinevue_type_template_id_59bf336a_render = function render() {
       },
       expression: "checkBoxList"
     }
-  }, [_c('van-cell-group', _vm._l(_vm.personList, function (item, index) {
+  }, [_c('van-cell-group', _vm._l(_vm.filteredCandidates, function (item, index) {
     return _c('van-cell', {
       key: item.userId,
       attrs: {
@@ -15897,42 +16305,30 @@ var selectLinevue_type_template_id_59bf336a_render = function render() {
       },
       on: {
         "click": function ($event) {
-          return _vm.toggle(index);
+          return _vm.togglePerson(item.userId);
         }
       },
       scopedSlots: _vm._u([{
         key: "right-icon",
         fn: function () {
           return [_c('van-checkbox', {
-            ref: "checkboxes",
-            refInFor: true,
             attrs: {
               "name": item.userId
+            },
+            on: {
+              "click": function ($event) {
+                $event.stopPropagation();
+              }
             }
           })];
         },
         proxy: true
       }], null, true)
     });
-  }), 1)], 1)], 1)])], 1);
+  }), 1)], 1)], 1)])], 1)], 1);
 };
-var selectLinevue_type_template_id_59bf336a_staticRenderFns = [];
+var selectLinevue_type_template_id_1aa06fdd_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
 
 
@@ -15968,9 +16364,16 @@ function normalizeCandidates(people) {
       showdialog: false,
       selectPersonType: 1,
       preNode: null,
-      scopeLoading: false
+      scopeLoading: false,
+      candidateKeyword: ''
     };
   },
+  computed: {
+    filteredCandidates() {
+      const keyword = this.candidateKeyword.trim().toLowerCase();
+      return this.personList.filter(p => !keyword || (p.name + ' ' + p.userId).toLowerCase().includes(keyword));
+    }
+  },
   mounted() {
     if (this.data) {
       let keyArray = ["baseUrl", "treeUrl", "uid"];
@@ -15993,6 +16396,10 @@ function normalizeCandidates(people) {
     }
   },
   methods: {
+    canRemoveApprover: canRemoveApprover,
+    togglePerson(id) {
+      this.checkBoxList = this.checkBoxList.includes(id) ? this.checkBoxList.filter(value => value !== id) : [...this.checkBoxList, id];
+    },
     radioSelectd(item) {
       var me = this;
       console.log(item);
@@ -16011,8 +16418,12 @@ function normalizeCandidates(people) {
           checkdList = me.personList.filter(item => me.checkBoxList.includes(item.userId));
         }
       }
+      if (me.preNode && me.preNode.type === 'check' && !checkdList.length) {
+        toast.fail('至少保留一位审批人');
+        return;
+      }
       me.approveList.forEach(node => {
-        if (checkdList && checkdList.length > 0 && node.id == me.preNode.id) {
+        if (node.id == me.preNode.id) {
           node.list = checkdList;
         }
       });
@@ -16037,6 +16448,7 @@ function normalizeCandidates(people) {
       me.personList = [];
       me.radioSelect = null;
       me.checkBoxList = [];
+      me.candidateKeyword = '';
     },
     toggle(index) {
       console.log(index);
@@ -16119,7 +16531,12 @@ function normalizeCandidates(people) {
             }
             // Only department role holders inside the configured range may be preselected.
             if (isCopyScope(item)) list = scopedRoleDefaults;
+            if (item.approvalControlsEnabled === true && item.selectionRestricted === true && Number(item.checker.type) === 9 && String(item.checker.defaultApprover) === '1') list = item.selectionCandidates;
+            list = constrainDefaults(item, list);
             return {
+              selectionRestricted: item.selectionRestricted,
+              selectionCandidates: item.selectionCandidates,
+              approvalControlsEnabled: item.approvalControlsEnabled,
               id: item.id,
               type: item.type,
               name: item.name,
@@ -16130,7 +16547,8 @@ function normalizeCandidates(people) {
               editApprover: item.checker.editApprover,
               selectedPersons: item.checker.selectedPersons,
               isOptional: item.checker.isOptional,
-              list: this.uniqueByUserId(list)
+              list: this.uniqueByUserId(list),
+              defaultApproverIds: normalizeCandidates(list).map(person => person.userId)
             };
           });
           Promise.all(approveList).then(res => {
@@ -16151,24 +16569,23 @@ function normalizeCandidates(people) {
       });
     },
     ableEdit(node) {
-      if ([7, 8, 9].includes(node.checkertype) && node.editApprover == 1 || node.type == "copy" && node.isOptional == 1) {
-        return true;
-      } else {
-        return false;
-      }
+      return canEditApprovers(node);
     },
     async addApprover(node) {
+      if (!this.ableEdit(node)) return;
       let me = this;
-      const scoped = isScopedSelection(node);
+      const scoped = hasCandidateRange(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);
+        let candidates = normalizeCandidates(node.selectionRestricted === true ? node.selectionCandidates : 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,
+              projectId: me.data.projectId,
+              deptId: me.data.deptId,
               nodeId: node.id
             });
             if (Number(response.status) !== 200 || !Array.isArray(response.result && response.result.data)) throw new Error(response.message || '读取可选范围失败，请重试');
@@ -16216,6 +16633,10 @@ function normalizeCandidates(people) {
         });
         myTree2.init();
         myTree2.submitTree(function (res) {
+          if (node.type === 'check' && (!res || !res.length)) {
+            toast.fail('至少保留一位审批人');
+            return;
+          }
           node.list = res.map(item => {
             return {
               userId: item.key,
@@ -16230,10 +16651,18 @@ function normalizeCandidates(people) {
     },
     deleteApprover(node, userId) {
       console.log("deleteApprover", node, userId);
-      if (!this.ableEdit(node)) return;
+      if (!this.ableEdit(node) && !canReduceDefaultApprovers(node)) return;
+      if (!canRemoveApprover(node)) {
+        toast.fail('至少保留一位审批人');
+        return;
+      }
       dialog.confirm({
         title: "是否确认删除该人员？"
       }).then(() => {
+        if (!canRemoveApprover(node)) {
+          toast.fail('至少保留一位审批人');
+          return;
+        }
         node.list = node.list.filter(item => {
           return item.userId != userId;
         });
@@ -16243,6 +16672,12 @@ function normalizeCandidates(people) {
       let submitFlag = true;
       let optionalUserList = [];
       this.approveList.forEach(item => {
+        const selectionError = approvalSelectionError(item);
+        if (selectionError) {
+          submitFlag = false;
+          toast.fail(selectionError);
+          return;
+        }
         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) {
@@ -16295,10 +16730,10 @@ function normalizeCandidates(people) {
 });
 ;// 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=59bf336a&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=1aa06fdd&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=59bf336a&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=1aa06fdd&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16311,8 +16746,8 @@ function normalizeCandidates(people) {
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_59bf336a_render,
-  selectLinevue_type_template_id_59bf336a_staticRenderFns,
+  selectLinevue_type_template_id_1aa06fdd_render,
+  selectLinevue_type_template_id_1aa06fdd_staticRenderFns,
   false,
   null,
   null,