saas-tenant-approve-app 0.2.29 → 0.2.31

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=5649ef6d&scoped=true
-var approveLineAllvue_type_template_id_5649ef6d_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=fcb1463a&scoped=true
+var approveLineAllvue_type_template_id_fcb1463a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14691,7 +14691,7 @@ var approveLineAllvue_type_template_id_5649ef6d_scoped_true_render = function re
     }
   }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var approveLineAllvue_type_template_id_5649ef6d_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_fcb1463a_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -15507,7 +15507,7 @@ approveMobileTree.prototype = {
           });
           console.log("userList", userList);
           //添加人员到节点中
-          if (node.nodeType == 'copy') {
+          if (step.nodeType == 'copy') {
             step.copyerDtoList = userList;
           } else {
             step.approverDtoList = userList;
@@ -15717,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=5649ef6d&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=fcb1463a&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=5649ef6d&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=fcb1463a&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -15733,18 +15733,18 @@ approveMobileTree.prototype = {
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_5649ef6d_scoped_true_render,
-  approveLineAllvue_type_template_id_5649ef6d_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_fcb1463a_scoped_true_render,
+  approveLineAllvue_type_template_id_fcb1463a_scoped_true_staticRenderFns,
   false,
   null,
-  "5649ef6d",
+  "fcb1463a",
   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=b480196e
-var selectLinevue_type_template_id_b480196e_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=6baeb3da
+var selectLinevue_type_template_id_6baeb3da_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15819,7 +15819,7 @@ var selectLinevue_type_template_id_b480196e_render = function render() {
     }
   }, [_vm._v(" 提交 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var selectLinevue_type_template_id_b480196e_staticRenderFns = [];
+var selectLinevue_type_template_id_6baeb3da_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
 
@@ -16051,8 +16051,12 @@ var selectLinevue_type_template_id_b480196e_staticRenderFns = [];
             toast.fail("请完整选择所有审批人");
             return;
           }
-        } else if ('copy' == item.type && item.checker.allowISNull != '1') {
-          if (item.list && item.list.length > 0) {
+        } else if ('copy' == item.type) {
+          if (item.checker.allowISNull != '1' && !item.list && item.list.length == 0) {
+            submitFlag = false;
+            toast.fail(item.name + "节点不能为空");
+            return;
+          } else if (item.list && item.list.length > 0) {
             item.list.forEach(li => {
               optionalUserList.push({
                 id: item.id,
@@ -16061,10 +16065,6 @@ var selectLinevue_type_template_id_b480196e_staticRenderFns = [];
                 userId: li.userId
               });
             });
-          } else {
-            submitFlag = false;
-            toast.fail(item.name + "节点不能为空");
-            return;
           }
         }
       });
@@ -16078,10 +16078,10 @@ var selectLinevue_type_template_id_b480196e_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=b480196e&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=6baeb3da&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=b480196e&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=6baeb3da&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16094,8 +16094,8 @@ var selectLinevue_type_template_id_b480196e_staticRenderFns = [];
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_b480196e_render,
-  selectLinevue_type_template_id_b480196e_staticRenderFns,
+  selectLinevue_type_template_id_6baeb3da_render,
+  selectLinevue_type_template_id_6baeb3da_staticRenderFns,
   false,
   null,
   null,