apply-clients 3.3.101 → 3.3.104

package/package.json

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

package/src/components/android/AppOnetomany.vue

@@ -164,56 +164,43 @@ 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(
-              `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
-              // `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(
+            `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
+            // `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)