apply-clients 3.3.100 → 3.3.103

package/src/components/android/Supervisory/AppSupervisoryCart.vue

@@ -81,7 +81,7 @@ export default {
           tablename: 't_charge_record',
           condition: `f_process_id = '${this.selectdata.f_process_id}'`
         }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data:data}, {
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:data}, {
           resolveMsg: null,
           rejectMsg: '收费信息查询失败！！！'
         })

package/src/components/product/Onetomany.vue

@@ -210,55 +210,42 @@ export default {
   },
   methods: {
     async confirmModal () {
-      if (this.modelTitle === '新增') {
-        //报警器设备型号校验
-        if (this.modelTitle === '新增' && this.selectdata.f_apply_type === '报警器报建'){
-          let data = {
-            f_material_name : "",
-            f_bjq_sid: "",
+      //报警器设备型号校验
+      if (this.selectdata.f_apply_type === '报警器报建'){
+        let data = {
+          f_material_name : "",
+          f_bjq_sid: "",
+        }
+        this.onetomany.fields.forEach(item=>{
+          if (item.label === '材料编号'){
+            data.f_bjq_sid = item.value
           }
-          this.onetomany.fields.forEach(item=>{
-            if (item.label === '材料编号'){
-              data.f_bjq_sid = item.value
-            }
-            if (item.label === '材料名称'){
-              data.f_material_name = item.value
-            }
-          })
-          if (data.f_material_name.substr(0,3) === '报警器'){
-            let res = await this.$resetpost(
-              `ncc/rs/logic/bjqcheck`,
-              // `/rs/logic/bjqcheck`,
-              data
-            )
-            if (res.data.code == 200){
-              if (this.onetomany.add.event) {
-                this.$dispatch(this.onetomany.add.event, this.index)
-              } else {
-                this.$dispatch('onetomanyadd', this.index)
-              }
-              this.closeModal()
-            }else {
-              this.disableButton = true
-              this.$showMessage(res.data.msg)
-            }
-          }else {
-            if (this.onetomany.add.event) {
-              this.$dispatch(this.onetomany.add.event, this.index)
-            } else {
-              this.$dispatch('onetomanyadd', this.index)
-            }
-            this.closeModal()
+          if (item.label === '材料名称'){
+            data.f_material_name = item.value
           }
-        }else {
-          if (this.onetomany.add.event) {
-            this.$dispatch(this.onetomany.add.event, this.index)
-          } else {
-            this.$dispatch('onetomanyadd', this.index)
+        })
+        if (data.f_material_name.substr(0,3) === '报警器'){
+          let res = await this.$resetpost(
+            `ncc/rs/logic/bjqcheck`,
+            // `/rs/logic/bjqcheck`,
+            data
+          )
+          if (res.data.code != 200){
+            this.disableButton = true
+            this.$showMessage(res.data.msg)
+            return
           }
-          this.closeModal()
         }
       }
+
+      if (this.modelTitle === '新增') {
+        if (this.onetomany.add.event) {
+          this.$dispatch(this.onetomany.add.event, this.index)
+        } else {
+          this.$dispatch('onetomanyadd', this.index)
+        }
+        this.closeModal()
+      }
       if (this.modelTitle === '修改') {
         if (this.onetomany.update.event) {
           this.$dispatch(this.onetomany.update.event, this.index, this.rowIndex)