saas-tenant-approve-app 0.2.7 → 0.2.9

package/lib/tips.common.js

@@ -10336,7 +10336,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-;// 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/approveLine.vue?vue&type=template&id=39f869a2&scoped=true
+;// 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/approveLine.vue?vue&type=template&id=d4179db2&scoped=true
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -14236,7 +14236,7 @@ const installer = {
           let SD = res.result.data ? res.result.data[0] : "";
           if (SD && (SD.signType == "1" || SD.signType == "2")) {
             that.approveStatus = SD.approverDtoList.some(item => {
-              if (item.userId == that.data.uid && (item.approveStatus == "1" || item.approveStatus == null)) {
+              if (item.userId == that.data.uid && SD.operateStatus == "1" && (item.approveStatus == "1" || item.approveStatus == null)) {
                 return true;
               }
             });
@@ -14263,12 +14263,13 @@ const installer = {
         id: that.data.id
       }).then(res => {
         if (res.status == 200) {
-          this.TrecordSteps = res.result.data;
+          that.TrecordSteps = res.result.data;
           // 1、不是审批状态不可操作
-          if (this.TrecordSteps.approveStatus != "1") {
-            this.approveStatus = false;
+          if (that.TrecordSteps.approveStatus != "1") {
+            that.approveStatus = false;
           }
         }
+        console.log("approveLine,that.approveStatus", that.approveStatus);
       });
     },
     diffTime(data) {
@@ -14360,10 +14361,10 @@ const installer = {
 });
 ;// CONCATENATED MODULE: ./src/components/approveLine.vue?vue&type=script&lang=js
  /* harmony default export */ var components_approveLinevue_type_script_lang_js = (approveLinevue_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/approveLine.vue?vue&type=style&index=0&id=39f869a2&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/approveLine.vue?vue&type=style&index=0&id=d4179db2&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLine.vue?vue&type=style&index=0&id=39f869a2&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLine.vue?vue&type=style&index=0&id=d4179db2&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
@@ -14478,14 +14479,14 @@ var component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "39f869a2",
+  "d4179db2",
   null
   
 )
 
 /* 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=d4d96a9a&scoped=true
-var approveLineAllvue_type_template_id_d4d96a9a_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=de61d20e&scoped=true
+var approveLineAllvue_type_template_id_de61d20e_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -14675,7 +14676,7 @@ var approveLineAllvue_type_template_id_d4d96a9a_scoped_true_render = function re
     }
   }, [_vm._v("同意 ")])], 1)], 1)], 1) : _vm._e()], 1);
 };
-var approveLineAllvue_type_template_id_d4d96a9a_scoped_true_staticRenderFns = [];
+var approveLineAllvue_type_template_id_de61d20e_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(9122);
@@ -14785,6 +14786,14 @@ function getDeptRoleUsers(baseurl, data) {
     "van-button": es_button,
     "van-field": field
   },
+  watch: {
+    approveStatus: {
+      handler(newVal, oldVal) {
+        console.log("this.approveStatus", this.approveStatus);
+      },
+      deep: true
+    }
+  },
   mounted() {
     if (this.data) {
       this.SAAS_TENANT_API = this.data.baseUrl;
@@ -14818,7 +14827,7 @@ function getDeptRoleUsers(baseurl, data) {
           let SD = res.result.data ? res.result.data[this.active - 1] : "";
           if (SD && (SD.signType == "1" || SD.signType == "2")) {
             that.approveStatus = SD.approverDtoList.some(item => {
-              if (item.userId == that.data.uid && (item.approveStatus == "1" || item.approveStatus == null)) {
+              if (item.userId == that.data.uid && SD.operateStatus == "1" && (item.approveStatus == "1" || item.approveStatus == null)) {
                 return true;
               }
             });
@@ -14851,6 +14860,7 @@ function getDeptRoleUsers(baseurl, data) {
             that.approveStatus = false;
           }
         }
+        console.log("that.approveStatus", that.approveStatus);
       });
     },
     uniqueByUserId(array) {
@@ -14945,10 +14955,10 @@ function getDeptRoleUsers(baseurl, data) {
 });
 ;// 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=d4d96a9a&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=de61d20e&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=d4d96a9a&prod&scoped=true&lang=css
+;// CONCATENATED MODULE: ./src/components/approveLineAll.vue?vue&type=style&index=0&id=de61d20e&prod&scoped=true&lang=css
 
 ;// CONCATENATED MODULE: ./src/components/approveLineAll.vue
 
@@ -14961,11 +14971,11 @@ function getDeptRoleUsers(baseurl, data) {
 
 var approveLineAll_component = normalizeComponent(
   components_approveLineAllvue_type_script_lang_js,
-  approveLineAllvue_type_template_id_d4d96a9a_scoped_true_render,
-  approveLineAllvue_type_template_id_d4d96a9a_scoped_true_staticRenderFns,
+  approveLineAllvue_type_template_id_de61d20e_scoped_true_render,
+  approveLineAllvue_type_template_id_de61d20e_scoped_true_staticRenderFns,
   false,
   null,
-  "d4d96a9a",
+  "de61d20e",
   null
   
 )