apply-clients 3.5.5-51 → 3.5.5-53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.5-51",
+  "version": "3.5.5-53",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/yangchunboneng/android/AppServiceControl.vue

@@ -1282,8 +1282,21 @@ export default {
       if (((this.show_data.defname === '工程审批' && (this.show_data.f_apply_type === '民用散户报建流程'|| this.show_data.f_apply_type === '民用预留户报建流程'))|| (this.show_data.defname === '工程决算')) && this.show_data.button.button_name === '提交' && this.show_data.f_payment_ratio == "100%"){
         this.show_data.button.button_name = '跳过'
       }
-      if (this.show_data.defname === '通气申请' && this.show_data.f_apply_type === '启封通气'&& this.show_data.button.button_name === '提交' && this.show_data.f_apply_source !== '线下发起' && this.show_data.f_apply_nature !== '预留户'){
-        this.show_data.button.button_name = '跳过'
+      if (this.show_data.defname === '通气申请' && this.show_data.f_apply_type === '启封通气'&& this.show_data.button.button_name === '提交' && this.show_data.f_apply_source == '自动发起' ){
+        let data = {
+          tablename: 't_apply',
+          condition: `f_process_id = '${this.show_data.f_parent_process_id}'`
+        }
+        let res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: null}
+        )
+        if (res.data.length>0){
+          if (res.data[0].f_payment_ratio == "100%"){
+            this.show_data.button.button_name = '跳过'
+          }
+        }
       }
       if(this.show_data.defname === '工程派工' && this.show_data.button.button_name === '提交'){
         this.show_data.f_budget_peoples = []
@@ -1330,7 +1343,7 @@ export default {
         }
         await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,{data: data},{rejectMsg:null,resolveMsg:null}).then( res=>{
           if (res.data.length == 0){
-            http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`,{data: {condition:` f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: Vue.user.id,orgid: Vue.user.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
+            http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`,{data: {condition:` u.f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: Vue.user.id,orgid: Vue.user.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
               const show_data = row.data[0]
               show_data.user = Vue.user
               show_data.start_activity ='报装申请'

package/src/filiale/yangchunboneng/pc/ServiceControl.vue

@@ -1942,7 +1942,7 @@
           await http.load('post',`rs/sql/apply_singleTable`,{data: data},{rejectMsg:null,resolveMsg:null}).then( res=>{
           //判断res.data.length == 0，则子流程已经完工，然后将付流程进行到下一步
             if (res.data.length == 0){
-              http.load('post',`rs/sql/supervisory`,{data: {condition:` f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: this.$login.f.id,orgid: this.$login.f.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
+              http.load('post',`rs/sql/supervisory`,{data: {condition:` u.f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: this.$login.f.id,orgid: this.$login.f.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
                const show_data = row.data[0]
                 show_data.user = this.$login.f
                 show_data.start_activity ='报装申请'