apply-clients 4.1.52-weinan → 4.1.54-weinan

package/package.json

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

package/src/components/app_apply/AppChargeManagement.vue

@@ -311,28 +311,27 @@ export default {
           user: Vue.user,
           f_out_trade_no:""
         }
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
-          resolveMsg: null,
-          rejectMsg: null
-        }).then(res=>{
-          console.log(res.data)
-          if (res.data.code == '200'){
-              let data1 = {
-                tablename: 't_userinfo',
-                condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
-              }
-              http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'}).then(res1=>{
-                debugger
-                this.$showMessage( `确认对${res1.data[0].f_user_name}进行${this.charge.f_payment_method}收费?`,['confirm', 'cancel']).then((res)=>{
-                  if (res=='confirm'){
-                    this.$showMessage('缴费成功！')
-                    this.saveother()
-                    this.showCharge=false
-                    return
-                  }
-                })
+        let data1 = {
+          tablename: 't_userinfo',
+          condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+        }
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'}).then(res1=>{
+          this.$showMessage( `确认对${res1.data[0].f_user_name}进行${this.charge.f_payment_method}收费?`,['confirm', 'cancel']).then((res)=>{
+            if (res=='confirm'){
+              http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
+                resolveMsg: null,
+                rejectMsg: null
+              }).then(res=>{
+                console.log(res.data)
+                if (res.data.code == '200') {
+                  this.$showMessage('缴费成功！')
+                  this.saveother()
+                  this.search()
+                  this.showCharge=false
+                }
               })
-          }
+            }
+          })
         })
         return
       }

package/src/components/product/Process/Service/ServiceControl.vue

@@ -786,7 +786,8 @@ export default {
         this.$showAlert(e, 'warning', 3000)
         return
       }
-      if (model.f_entry_name){
+      if (model.f_entry_name && model.defname == '报建登记'){
+        debugger
         let http = new HttpResetClass()
         let data = {
           tablename:'t_apply',