saas-tenant-approve-app 0.2.35 → 0.2.36

package/lib/tips.common.js

@@ -15743,8 +15743,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=1d70c186
-var selectLinevue_type_template_id_1d70c186_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=05d43e7c
+var selectLinevue_type_template_id_05d43e7c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -15846,7 +15846,7 @@ var selectLinevue_type_template_id_1d70c186_render = function render() {
       key: item.id,
       attrs: {
         "title": item.name,
-        "name": item,
+        "name": item.userId,
         "clickable": ""
       },
       on: {
@@ -15880,7 +15880,7 @@ var selectLinevue_type_template_id_1d70c186_render = function render() {
       attrs: {
         "clickable": "",
         "title": item.name,
-        "name": item
+        "name": item.userId
       },
       on: {
         "click": function ($event) {
@@ -15903,7 +15903,7 @@ var selectLinevue_type_template_id_1d70c186_render = function render() {
     });
   }), 1)], 1)], 1)])], 1);
 };
-var selectLinevue_type_template_id_1d70c186_staticRenderFns = [];
+var selectLinevue_type_template_id_05d43e7c_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
 
@@ -15937,7 +15937,8 @@ var selectLinevue_type_template_id_1d70c186_staticRenderFns = [];
       SAAS_TENANT_API: "",
       showBtn: false,
       showdialog: false,
-      selectPersonType: 1
+      selectPersonType: 1,
+      preNode: null
     };
   },
   mounted() {
@@ -15964,32 +15965,47 @@ var selectLinevue_type_template_id_1d70c186_staticRenderFns = [];
   methods: {
     radioSelectd(item) {
       var me = this;
-      me.radioSelect = item;
+      console.log(item);
+      me.radioSelect = item.userId;
+      console.log(me.radioSelect);
     },
     confirmdialog() {
       var me = this;
+      var checkdList = [];
+      if (me.selectPersonType == 1) {
+        if (me.radioSelect && me.radioSelect) {
+          checkdList = me.personList.filter(item => item.userId == me.radioSelect);
+        }
+      } else {
+        if (me.checkBoxList && me.checkBoxList.length > 0) {
+          checkdList = me.personList.filter(item => me.checkBoxList.includes(item.userId));
+        }
+      }
       me.approveList.forEach(node => {
-        if (me.selectPersonType == 1) {
-          if (me.checkBoxList && me.checkBoxList.length > 0) {
-            node.list = JSON.parse(JSON.stringify(me.checkBoxList));
-          }
-        } else {
-          if (me.radioSelect && me.radioSelect.id) {
-            node.list = [JSON.parse(JSON.stringify(me.radioSelect))];
-          }
+        if (checkdList && checkdList.length > 0 && node.id == me.preNode.id) {
+          node.list = checkdList;
         }
       });
+      me.preNode = null;
       me.personList = [];
       me.radioList = null;
       this.showdialog = false;
     },
     canceldialog() {
       var me = this;
+      if (me.preNode) {
+        me.approveList.forEach(node => {
+          if (node.id == me.preNode.id) {
+            node.list = JSON.parse(JSON.stringify(me.preNode.list));
+          }
+        });
+      }
       me.personList = [];
       me.radioList = null;
       this.showdialog = false;
     },
     toggle(index) {
+      console.log(index);
       this.$refs.checkboxes[index].toggle();
     },
     getInfo() {
@@ -16104,6 +16120,7 @@ var selectLinevue_type_template_id_1d70c186_staticRenderFns = [];
         //申请人自选，审批人自选
         me.personList = [];
         me.selectPersonType = node.selectPersonType;
+        me.preNode = node;
         node.checker.selectedPersons.forEach(item => {
           me.personList.push({
             userId: item.id,
@@ -16212,10 +16229,10 @@ var selectLinevue_type_template_id_1d70c186_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=1d70c186&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=05d43e7c&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=1d70c186&prod&lang=css
+;// CONCATENATED MODULE: ./src/components/selectLine.vue?vue&type=style&index=0&id=05d43e7c&prod&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/selectLine.vue
 
@@ -16228,8 +16245,8 @@ var selectLinevue_type_template_id_1d70c186_staticRenderFns = [];
 
 var selectLine_component = normalizeComponent(
   components_selectLinevue_type_script_lang_js,
-  selectLinevue_type_template_id_1d70c186_render,
-  selectLinevue_type_template_id_1d70c186_staticRenderFns,
+  selectLinevue_type_template_id_05d43e7c_render,
+  selectLinevue_type_template_id_05d43e7c_staticRenderFns,
   false,
   null,
   null,