saas-tenant-approve-app 0.2.40 → 0.2.42

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=3d06ac7b&scoped=true
-var approveLineAllvue_type_template_id_3d06ac7b_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=0171b230&scoped=true
+var approveLineAllvue_type_template_id_0171b230_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14572,7 +14572,7 @@ var approveLineAllvue_type_template_id_3d06ac7b_scoped_true_render = function re
         "plain": "",
         "type": "primary"
       }
-    }, [_vm._v("依次")]) : _vm._e(), _vm.ableEdit(step) && _vm.data.editApprover && step.unApprovedFlag ? _c('van-button', {
+    }, [_vm._v("依次")]) : _vm._e(), _vm.ableEdit(step) && _vm.data.editApprover && step.unApprovedFlag && !_vm.data.readonly ? _c('van-button', {
       staticStyle: {
         "position": "relative",
         "top": "-4px"
@@ -14691,7 +14691,7 @@ var approveLineAllvue_type_template_id_3d06ac7b_scoped_true_render = function re
     }
   }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var approveLineAllvue_type_template_id_3d06ac7b_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_0171b230_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -15718,10 +15718,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=3d06ac7b&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=0171b230&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=3d06ac7b&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=0171b230&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -15734,18 +15734,18 @@ approveMobileTree.prototype = {
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_3d06ac7b_scoped_true_render,
-  approveLineAllvue_type_template_id_3d06ac7b_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_0171b230_scoped_true_render,
+  approveLineAllvue_type_template_id_0171b230_scoped_true_staticRenderFns,
   false,
   null,
-  "3d06ac7b",
+  "0171b230",
   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=01ee83a2
-var selectLinevue_type_template_id_01ee83a2_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=9eacb8b4
+var selectLinevue_type_template_id_9eacb8b4_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15902,7 +15902,7 @@ var selectLinevue_type_template_id_01ee83a2_render = function render() {
     });
   }), 1)], 1)], 1)])], 1);
 };
-var selectLinevue_type_template_id_01ee83a2_staticRenderFns = [];
+var selectLinevue_type_template_id_9eacb8b4_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
 
@@ -16050,7 +16050,7 @@ var selectLinevue_type_template_id_01ee83a2_staticRenderFns = [];
               }
             }
             //  3.指定标签,查询queryTSysUserRoleList
-            if (item.checker.type == 3 || item.type == "copy" && roleList.length) {
+            if (item.checker.type == 3 || item.type == "copy" && roleList.length && item.checker.isOptional && item.checker.isOptional == '0') {
               let res = await queryTSysUserRoleList(that.SAAS_TENANT_API, {
                 roleList
               });
@@ -16063,7 +16063,7 @@ var selectLinevue_type_template_id_01ee83a2_staticRenderFns = [];
               }
             }
             // 9.部门标签自选，查getDeptRoleUsers接口选，10仅展示
-            if (item.checker.type == 9 || item.checker.type == 10) {
+            if (item.checker.type == 9 || item.checker.type == 10 || item.checker.type == 11 || item.type == "copy" && item.checker.isOptional && item.checker.isOptional == '1') {
               let res = await getDeptRoleUsers(that.SAAS_TENANT_API, {
                 uid: that.data.uid,
                 roleList,
@@ -16077,7 +16077,7 @@ var selectLinevue_type_template_id_01ee83a2_staticRenderFns = [];
               }
             }
             // 789选人节点，默认审批人为否，不回填
-            if ([7, 8, 9].includes(item.checker.type) && item.checker.defaultApprover != 1) {
+            if (([7, 8, 9].includes(item.checker.type) || item.type == "copy" && item.checker.isOptional && item.checker.isOptional == '1') && item.checker.defaultApprover != 1) {
               list = [];
             }
             return {
@@ -16233,10 +16233,10 @@ var selectLinevue_type_template_id_01ee83a2_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=01ee83a2&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=9eacb8b4&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=01ee83a2&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=9eacb8b4&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16249,8 +16249,8 @@ var selectLinevue_type_template_id_01ee83a2_staticRenderFns = [];
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_01ee83a2_render,
-  selectLinevue_type_template_id_01ee83a2_staticRenderFns,
+  selectLinevue_type_template_id_9eacb8b4_render,
+  selectLinevue_type_template_id_9eacb8b4_staticRenderFns,
   false,
   null,
   null,