apply-clients 3.3.101 → 3.3.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.101",
+  "version": "3.3.102",
   "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)

package/src/components/android/AppServiceView.vue

@@ -179,17 +179,6 @@
         </div>
       </div>
     </div>
-      <!--区域地址联动-->
-      <!--<div>-->
-      <!--  <app-res-area-select-group-->
-      <!--    v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"-->
-      <!--    labelstyle = "control-label"-->
-      <!--    @shiji-select = "getSelectShijiValue"-->
-      <!--    @xian-select = "getSelectXianValue"-->
-      <!--    @shequ-select = "getSelectShequValue"-->
-      <!--  >-->
-      <!--  </app-res-area-select-group>-->
-      <!--</div>-->
     <div class="col-sm-12 col-xs-12" id="test11">
       <accordion one-at-a-time="true">
         <panel v-for="(i,item) in data.onetomany" :header="item.title" :is-open="false" type="primary">
@@ -203,16 +192,7 @@
 
     <!--自定义组件-->
     <slot>
-      <div>
-        <app-res-area-select-group
-          v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
-          labelstyle = "control-label"
-          @shiji-select = "getSelectShijiValue"
-          @xian-select = "getSelectXianValue"
-          @shequ-select = "getSelectShequValue"
-        >
-        </app-res-area-select-group>
-      </div>
+
     </slot>
 
     <!-- 按钮组 -->

package/src/components/android/AreaSelect/AppResAreaSelectGroup.vue

@@ -100,7 +100,9 @@ export default {
         this.xianfontColors = this.pub2Colors
         this.shequfontColors = this.pub2Colors
       }
-      this.$dispatch('shiji-select', value, lable)
+      this.$parent.$parent.$parent.areaData.sjvalue = value
+      this.$parent.$parent.$parent.disableButton()
+      // this.$dispatch('shiji-select', value, lable)
     },
     async getjdao(value,lable,obj) {
       this.jdao_options = []
@@ -118,7 +120,9 @@ export default {
         this.xianfontColors = this.pub2Colors
         this.shequfontColors = this.pub2Colors
       }
-      this.$dispatch('xian-select',value, lable)
+      this.$parent.$parent.$parent.areaData.xianvalue = value
+      this.$parent.$parent.$parent.disableButton()
+      // this.$dispatch('xian-select',value, lable)
     },
     async getshequ(value,lable,obj) {
       if (value !=null && value.length!=0){
@@ -126,7 +130,9 @@ export default {
       }else {
         this.shequfontColors = this.pub2Colors
       }
-      this.$dispatch('shequ-select',value, lable)
+      this.$parent.$parent.$parent.areaData.sqvalue = value
+      this.$parent.$parent.$parent.disableButton()
+      // this.$dispatch('shequ-select',value, lable)
     }
   },
   watch: {

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)