apply-clients 3.3.81 → 3.3.83

package/package.json

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

package/src/App.vue

@@ -3,7 +3,7 @@
     <app-base class="bg">
       <div class='flex'>
         <article>
-          <route :comp="{name: 'login-app'}"></route>
+          <route :comp="{name: 'login'}"></route>
         </article>
       </div>
     </app-base>

package/src/apply.js

@@ -89,4 +89,9 @@ export default function () {
   Vue.component('ignition-bill-list', (resolve) => { require(['./components/product/Print/IgnitionBill/IgnitionBill'], resolve) })
 
   Vue.component('business-apply', (resolve) => { require(['./components/product/Business/BusinessApply'], resolve) })
+
+  // 区域 地址下拉框联动组件
+  Vue.component('res-area-select', (resolve) => { require(['./components/product/AreaSelect/ResAreaSelect'], resolve) })
+  Vue.component('res-area-select-group', (resolve) => { require(['./components/product/AreaSelect/ResAreaSelectGroup'], resolve) })
+  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
 }

package/src/applyAndroid.js

@@ -1,34 +1,39 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-  /** ***************************报建模块*********************************/
-  // 报建 总入口
-  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
-  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
-  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
-  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
-  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
-  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
-
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
-  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
-  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
-  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
-
-  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
-  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
-  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
-  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
-  // 选择用户信息
-  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
-  // 选择报建项目
-  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
-  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+  /** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
+  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
+  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
+  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
+  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
+  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
+
+  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
+  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
+  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
+  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
+
+  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
+  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
+  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
+  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
+  // 选择用户信息
+  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
+  // 选择报建项目
+  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
+  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
+
+  // 区域 地址下拉框联动组件
+  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
+  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
+  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
+}

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()