saas-tenant-approve-app 0.2.27 → 0.2.29

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=35a2e79f&scoped=true
-var approveLineAllvue_type_template_id_35a2e79f_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=5649ef6d&scoped=true
+var approveLineAllvue_type_template_id_5649ef6d_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14691,7 +14691,7 @@ var approveLineAllvue_type_template_id_35a2e79f_scoped_true_render = function re
     }
   }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var approveLineAllvue_type_template_id_35a2e79f_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_5649ef6d_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -15447,7 +15447,7 @@ approveMobileTree.prototype = {
       if (me.approveList && me.approveList.length > 0) {
         var node = me.approveList.find(item => item.id == step.nodeId);
         let defaultKey = [];
-        if (node.nodeType == 'copy') {
+        if (step.nodeType == 'copy') {
           if (step.copyerDtoList && step.copyerDtoList.length) {
             defaultKey = step.copyerDtoList.map(item => {
               return {
@@ -15612,9 +15612,13 @@ approveMobileTree.prototype = {
       let stepApproverFlag = false;
       let stepApproverMsg = "";
       that.LrecordSteps.forEach(step => {
+        var node = that.approveList.find(item => item.id == step.nodeId);
         if (step.nodeType == "check" && step.nodeId != 'node-end' && (!step.approverDtoList || step.approverDtoList.length == 0)) {
           stepApproverFlag = true;
-          stepApproverMsg = step.nodeName + "节点审批人未配置";
+          stepApproverMsg = step.nodeName + "节点未配置";
+        } else if (step.nodeType == "copy" && node.checker.allowISNull != '1' && step.nodeId != 'node-end' && (!step.copyerDtoList || step.copyerDtoList.length == 0)) {
+          stepApproverFlag = true;
+          stepApproverMsg = step.nodeName + "节点未配置";
         }
       });
       if (stepApproverFlag) {
@@ -15713,10 +15717,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=35a2e79f&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=5649ef6d&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=35a2e79f&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=5649ef6d&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -15729,18 +15733,18 @@ approveMobileTree.prototype = {
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_35a2e79f_scoped_true_render,
-  approveLineAllvue_type_template_id_35a2e79f_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_5649ef6d_scoped_true_render,
+  approveLineAllvue_type_template_id_5649ef6d_scoped_true_staticRenderFns,
   false,
   null,
-  "35a2e79f",
+  "5649ef6d",
   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=20d95eed
-var selectLinevue_type_template_id_20d95eed_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=b480196e
+var selectLinevue_type_template_id_b480196e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15815,7 +15819,7 @@ var selectLinevue_type_template_id_20d95eed_render = function render() {
     }
   }, [_vm._v(" 提交 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var selectLinevue_type_template_id_20d95eed_staticRenderFns = [];
+var selectLinevue_type_template_id_b480196e_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
 
@@ -16047,7 +16051,7 @@ var selectLinevue_type_template_id_20d95eed_staticRenderFns = [];
             toast.fail("请完整选择所有审批人");
             return;
           }
-        } else if ('copy' == item.type && item.allowISNull != '1') {
+        } else if ('copy' == item.type && item.checker.allowISNull != '1') {
           if (item.list && item.list.length > 0) {
             item.list.forEach(li => {
               optionalUserList.push({
@@ -16059,7 +16063,7 @@ var selectLinevue_type_template_id_20d95eed_staticRenderFns = [];
             });
           } else {
             submitFlag = false;
-            toast.fail("请选择抄送节点人员");
+            toast.fail(item.name + "节点不能为空");
             return;
           }
         }
@@ -16074,10 +16078,10 @@ var selectLinevue_type_template_id_20d95eed_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=20d95eed&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=b480196e&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=20d95eed&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=b480196e&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16090,8 +16094,8 @@ var selectLinevue_type_template_id_20d95eed_staticRenderFns = [];
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_20d95eed_render,
-  selectLinevue_type_template_id_20d95eed_staticRenderFns,
+  selectLinevue_type_template_id_b480196e_render,
+  selectLinevue_type_template_id_b480196e_staticRenderFns,
   false,
   null,
   null,