apply-clients 3.3.81 → 3.3.85

package/src/components/android/AppOnetomany.vue

@@ -151,7 +151,7 @@ import {guid, toStandardTimeString} from '../Util'
 import Vue from 'vue'
 export default {
   title: 'onetomany',
-  props: ['onetomany', 'index'],
+  props: ['onetomany', 'index','selectdata'],
   data () {
     return {
       showModal: false,
@@ -163,12 +163,54 @@ export default {
   ready () {
   },
   methods: {
-    confirmModal () {
+    async confirmModal () {
       if (this.modelTitle === '新增') {
-        if (this.onetomany.add.event) {
-          this.$dispatch(this.onetomany.add.event, this.index)
-        } else {
-          this.$dispatch('onetomanyadd', this.index)
+        //报警器设备型号校验
+        if (this.modelTitle === '新增' && 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
+            }
+            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`,
+              // `/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()
+          }
+        }else {
+          if (this.onetomany.add.event) {
+            this.$dispatch(this.onetomany.add.event, this.index)
+          } else {
+            this.$dispatch('onetomanyadd', this.index)
+          }
+          this.closeModal()
         }
       }
       if (this.modelTitle === '修改') {
@@ -177,9 +219,9 @@ export default {
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
+        this.closeModal()
       }
-
-      this.closeModal()
+      // this.closeModal()
     },
     onchange (fieldIndex) {
       this.disableModalButton()