apply-clients 3.5.5-44 → 3.5.5-46

package/package.json

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

package/src/filiale/fugou/android/AppExplorationUser.vue

@@ -408,8 +408,8 @@ export default {
 
       data.f_sub_state = "新增"
       data.f_apply_source = "线下发起"
-      data.f_process_id = await this.getProcessId(data.processname)
-
+     // data.f_process_id = await this.getProcessId(data.processname)
+      data.workname=data.processname
       // 调用ExplorationUser事件
 
       this.click(data)

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

@@ -259,13 +259,17 @@ export default {
           return
         }
         this.excessive=true
-        let res = await this.$resetpost(
-          // `rs/logic/ApplyProductService`,
-          `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,
-          {data: this.show_data},
-          {resolveMsg: null, rejectMsg: '数据保存失败'}
-        )
-        this.excessive=false
+        try {
+          let res = await this.$resetpost(
+            `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,
+            {data: this.show_data},
+            {resolveMsg: null, rejectMsg: '数据保存失败'}
+          )
+        }catch (e) {
+          console.log(e)
+        }finally {
+          this.excessive=false
+        }
         if (this.show_data.button.after) {
           this[this.show_data.button.after]()
         }

package/src/filiale/qianneng/pc/FunctionServiceControl.vue

@@ -565,14 +565,20 @@
       async 'searchbuilding' (index) {
         this.setLabelValue('楼号/组', null)
         this.selectdata.f_residential_area = this.getLableValue('小区')
+        this.selectdata.f_street = this.getLableValue('街道/乡镇')
+        if (isEmpty(this.selectdata.f_residential_area)){
+          return
+        }
         let data = {
-          tablename: 't_building',
-          condition: `f_filialeid = '${this.$login.f.orgid}' and f_residential_area like '%${this.selectdata.f_residential_area}%'`
+          items:'b.f_building',
+          orderitem: 'b.id',
+          tablename: 't_building b left join t_area a on b.f_residential_area_id = a.id',
+          condition: `b.f_filialeid = '${this.$login.f.orgid}' and b.f_residential_area like '%${this.selectdata.f_residential_area}' and a.f_street = '${this.selectdata.f_street}'`
         }
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
-          `rs/sql/apply_singleTable`,
+          `rs/sql/tel_singleTable_OrderBy`,
           {data: data},
           {resolveMsg: null, rejectMsg: '楼号查询失败！！！'}
         )