apply-clients 3.4.3 → 3.4.4

package/package.json

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

package/src/AndroidApp.vue

@@ -2,12 +2,12 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-<!--      <route :comp="{name: 'build-tsak'}" name="root"></route>-->
-      <!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
-      <!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
-      <!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
-      <!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
-            <route :comp="{name: 'login-app'}" name="root"></route>
+<!--      <route :comp="{name: 'app-exploration-user'}" name="root"></route>-->
+<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
+<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
+<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
+<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+      <route :comp="{name: 'login-app'}" name="root"></route>
     </article>
     <time-out></time-out>
     <message-box></message-box>
@@ -18,18 +18,18 @@
 
 <script>
 
-import AlertBox from "vue-client/src/components/AlertBox";
-import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
+  import AlertBox from "vue-client/src/components/AlertBox";
+  import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
 
-export default {
-  ready () {
-    if(!window.onerror) {
-      window.onerror = function (message, file, line, col, error) {
-        // HostApp.alert("Error occured: " + error.message)
-        return false
+  export default {
+    ready () {
+      if(!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("Error occured: " + error.message)
+          return false
+        }
       }
-    }
-  },
-  components: { AlertBox, AlertBoxBatch }
-}
+    },
+    components: { AlertBox, AlertBoxBatch }
+  }
 </script>

package/src/android.js

@@ -7,7 +7,7 @@ import applyAndroid from './applyAndroid'
 
 all()
 apply()
-applyAndroid('yuchuan')
+applyAndroid()
 systemphonegrid()
 
 require('./android-bootstrap/less/bootstrap.less')

package/src/apply.js

@@ -4,7 +4,7 @@ import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
 import ApplyLoadParams from './stores/ApplyLoadParams'
 /** ****************服务插件*********************/
 
-export default function (filiale) {
+export default function () {
   Vue.use(ApplyGetSaleParam)
   Vue.use(ApplyLoadParams)
 /** ***************************报建模块*********************************/
@@ -19,7 +19,7 @@ export default function (filiale) {
   Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
   Vue.component('onetomany', (resolve) => { require(['./components/product/Onetomany'], resolve) })
   // 显示退回理由tab页
-  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/Service/ShowBackReason'], resolve) })
+  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/ShowBackReason'], resolve) })
 
   /** 报建监控业务 **/
   // 流程监控入口页
@@ -39,11 +39,6 @@ export default function (filiale) {
   // 报建菜单页面控制层
   Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
 
-  /** 预约报建 **/
-  // Vue.component('order-apply', (resolve) => { require(['./components/product/Order/OrderApply'], resolve) })
-  // Vue.component('order-apply-list', (resolve) => { require(['./components/product/Order/OrderApplyList'], resolve) })
-  // Vue.component('order-message', (resolve) => { require(['./components/product/Order/OrderMessage'], resolve) })
-
   // 终止报建页面入口
   Vue.component('stop-apply', (resolve) => { require(['./components/product/Stop/StopApply'], resolve) })
   Vue.component('stop-apply-list', (resolve) => { require(['./components/product/Stop/StopApplyList'], resolve) })
@@ -51,6 +46,10 @@ export default function (filiale) {
   /** 报建收费记录 **/
   Vue.component('apply-charge-search', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeSearch'], resolve) })
   Vue.component('apply-charge-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeList'], resolve) })
+  /** 团购转散户 **/
+  Vue.component('apply-group-by-paper', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByPaper'], resolve) })
+  Vue.component('apply-group-by-main', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByMain'], resolve) })
+  Vue.component('apply-group-by-list', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByList'], resolve) })
 
   // 地址管理
   Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
@@ -58,30 +57,50 @@ export default function (filiale) {
   Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
   // 收费管理
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
-  Vue.component('apply-material-detailed', (resolve) => { require(['./components/product/Material/MaterialDetailed'], resolve) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  Vue.component('apply-print-chargepc', (resolve) => { require(['./components/product/Process/Processes/Print/printChargepc'], resolve) })
+  Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/Print/printRefund'], resolve) })
+
   // 补充协议
   Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
-  Vue.component('build-order-list', (resolve) => { require(['./components/product/Print/BuildOrder/buildOrderList'], resolve) })
-  /** 团购转散户 **/
-  Vue.component('apply-group-by-paper', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByPaper'], resolve) })
-  Vue.component('apply-group-by-main', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByMain'], resolve) })
-  Vue.component('apply-group-by-list', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByList'], resolve) })
-  Vue.component('business-apply', (resolve) => { require(['./components/product/Business/BusinessApply'], resolve) })
   // 选择用户信息
   Vue.component('select-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectUserinfo'], resolve) })
   // 选择报建项目
   Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
   // 设备管理
   Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
+  // 添加多个材料合并
+  Vue.component('add-material-science', (resolve) => { require(['./components/product/Process/Processes/addMaterialScience'], resolve) })
+  Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
 
   /** VueUtils **/
+  Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
+  Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })
   Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+  // Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/GaoPaiYi/HighMeter'], resolve) })
   Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
 
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
+  // 旧报装处理入口
+  Vue.component('old-apply', (resolve) => { require(['./components/product/OldApply/OldApply'], resolve) })
+  Vue.component('handle-old-apply', (resolve) => { require(['./components/product/OldApply/Handle/HandleApply'], resolve) })
+  Vue.component('monitor-old-apply', (resolve) => { require(['./components/product/OldApply/Monitor/MonitorApply'], resolve) })
+  Vue.component('old-apply-message', (resolve) => { require(['./components/product/OldApply/OldApplyMessage'], resolve) })
+
+  Vue.component('apply-material-detailed', (resolve) => { require(['./components/product/Material/MaterialDetailed'], resolve) })
+  Vue.component('apply-install-project', (resolve) => { require(['./components/product/Install/InstallProject'], resolve) })
+
+  Vue.component('build-order-list', (resolve) => { require(['./components/product/Print/BuildOrder/buildOrderList'], resolve) })
+  Vue.component('print-build-order', (resolve) => { require(['./components/product/Print/BuildOrder/printBuildOrder'], resolve) })
+
+  Vue.component('print-gnition-bill', (resolve) => { require(['./components/product/Print/IgnitionBill/printIgnitionBill'], resolve) })
+  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('civil-apply', (resolve) => { require(['./components/product/Business/CivilApply'], 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) })
+  // 地图组件
+  Vue.component('gaode-map', (resolve) => { require(['./components/product/GaoDeMapComponents/GaoDeMap'], resolve) })
 }

package/src/applyAndroid.js

@@ -5,7 +5,7 @@ import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
 import ApplyLoadParams from './stores/ApplyLoadParams'
 /** ****************服务插件*********************/
 
-export default function (filiale) {
+export default function () {
   Vue.use(ApplyGetSaleParam)
   Vue.use(ApplyLoadParams)
   /** ***************************报建模块*********************************/
@@ -14,19 +14,33 @@ export default function (filiale) {
   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('task-graph', (resolve) => { require(['./components/android/TaskGraph'], resolve) })
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
+
+  Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], 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) })
 
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/android`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
+  // 区域 地址下拉框联动组件
+  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) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  // 地图组件
+  Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
+  // 扫描二维码
+  Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
 }

package/src/components/android/AppOnetomany.vue

@@ -134,7 +134,12 @@
             </div>
           </div>
         </div>
+
+        <div v-if=" (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建')">
+          <app-qrcode-reader :istype = fmaterialname></app-qrcode-reader>
+        </div>
       </article>
+
       <footer slot="modal-footer" class="modal-footer">
         <button :class="disableButton?'btn btn-default':'btn btn-primary'"
                 :disabled="disableButton" type="button" @click.prevent="confirmModal()">
@@ -151,25 +156,56 @@ import {guid, toStandardTimeString} from '../Util'
 import Vue from 'vue'
 export default {
   title: 'onetomany',
-  props: ['onetomany', 'index'],
+  props: ['onetomany', 'index','selectdata'],
   data () {
     return {
       showModal: false,
       disableButton: true,
       modelTitle: null,
-      rowIndex: null
+      rowIndex: null,
+      fmaterialname : {}
     }
   },
   ready () {
   },
   methods: {
-    confirmModal () {
+    async confirmModal () {
+      //报警器设备型号校验
+      if (this.selectdata.f_apply_type === '报警器报建' || 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`,
+            // `ncc/rs/logic/bjqcheck`,
+            // `/rs/logic/bjqcheck`,
+            data
+          )
+          if (res.data.code != 200) {
+            this.disableButton = true
+            this.$showMessage(res.data.msg)
+            return
+          }
+        }
+      }
+
       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) {
@@ -177,11 +213,17 @@ export default {
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
+        this.closeModal()
       }
-
-      this.closeModal()
+      // this.closeModal()
     },
     onchange (fieldIndex) {
+      if (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {
+        if (this.onetomany.fields[fieldIndex].onchange === 'materialNameChenge'){
+          this.fmaterialname = this.onetomany.fields[fieldIndex].value
+        }
+      }
+
       this.disableModalButton()
       if (this.onetomany.fields[fieldIndex].onchange) {
         this.$dispatch(this.onetomany.fields[fieldIndex].onchange, this.index, fieldIndex)