apply-clients 3.3.110-229 → 3.3.110-235

package/package.json

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

package/src/apply.js

@@ -54,6 +54,7 @@ export default function () {
   // 收费管理
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], 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) })
 
   // 补充协议

package/src/components/android/AppSign.vue

@@ -95,7 +95,7 @@ export default {
       console.log('=========进来===============')
       let data = {
         tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}' `
+        condition: `f_blobid = '${this.blobid}' and fremarks='报装手机签字文件' `
       }
       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
         // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {

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

@@ -15,12 +15,13 @@ export default {
       type: Object,
       default: {}
     },
+    index: "",
   },
   data() {
     return {
       results: "",
       errors: "",
-      isshow:false
+      isshow:true
     }
   },
   methods: {
@@ -29,13 +30,15 @@ export default {
     },
     scan() {
       HostApp.__this__ = this
-      if (this.istype.f_material_name === '报警器-汉威'){
+      // if (this.istype.f_material_name === '报警器-汉威'){
+      //   HostApp.scanPhoneCode({callback: "javascript:HostApp.__this__.scanCallbackHanWei();"})
+      // } else {}
         HostApp.scanPhoneCode({callback: "javascript:HostApp.__this__.scanCallbackHanWei();"})
-      } else {}
-
     },
     scanCallbackHanWei() {
+      console.log("这是扫码输出:",this.index)
       this.results = ""
+
       let response = HostApp.getPhoneCode()
       if (response.code == 200) {
         let aray =  response.data.split(",")
@@ -44,7 +47,7 @@ export default {
             let tem = (aray[i]).split("=")
             if (tem[0] === "ID"){
               this.results = tem[1].trim().replaceAll("'","").trim()
-              this.$parent.$parent.onetomany.fields[5].value = this.results
+              this.$parent.$parent.materials[this.index].f_bjq_sid  = this.results
               break;
             }
           }
@@ -55,16 +58,16 @@ export default {
     }
   },
   watch: {
-    'istype'(){
-      // console.log("这是监听值:",this.istype)
-      if (this.istype){
-        if (this.istype.f_material_name === '报警器-汉威'){
-          this.isshow = true
-        } else {
-          this.isshow = false
-        }
-      }
-    },
+    // 'istype'(){
+    //   // console.log("这是监听值:",this.istype)
+    //   if (this.istype){
+    //     if (this.istype.f_material_name === '报警器-汉威'){
+    //       this.isshow = true
+    //     } else {
+    //       this.isshow = false
+    //     }
+    //   }
+    // },
   }
 }
 </script>

package/src/components/android/Process/AppServiceControl.vue

@@ -148,10 +148,10 @@ export default {
           this.$showMessage('请添加报警器物料信息!!!')
           return
         }
-        // if (numOne.length > 1){
-        //   this.$showMessage("暂时支持单个报警器物料安装!!!")
-        //   return
-        // }
+        if (numOne.length > 1){
+          this.$showMessage("暂时支持单个报警器物料安装!!!")
+          return
+        }
         datatemp.sqvalue = this.show_data.areaData.sqvalue
 
         bjqststedata.f_userinfo_code = this.show_data.f_userinfo_code
@@ -260,9 +260,13 @@ export default {
         )
         restp.data[0].processname = '散户报建流程'
         restp.data[0].defname = '合同签订'
-        this.$dispatch('gotoson',restp.data[0])
-        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self', restp.data[0])
-        // this.$dispatch('apply',restp.data[0])
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: restp.data[0].defname,
+          safe: true
+        })
+        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self')
 
       } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
         let data2 = {
@@ -282,8 +286,14 @@ export default {
         console.log('打印查询的内容',restp1)
         // restp1.data[0].processname = '散户报建流程'
         // restp1.data[0].defname = '报装缴费'
-        this.$dispatch('gotoson',restp1.data[0])
-        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self',restp1.data[0])
+
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: restp1.data[0].defname,
+          safe: true
+        })
+        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self')
       }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
         let data3 = {
           condition: `u.id = ${this.show_data.id}`,
@@ -300,16 +310,21 @@ export default {
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
         console.log('打印查询的内容',restp2)
+        debugger
         if(restp2.length>0){
-          this.$dispatch('gotoson',restp2.data[0])
-          this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self',restp2.data[0])
+          let _this = this
+          this.$dispatch('gotoson', {
+            _this: _this,
+            title: restp2.data[0].defname,
+            safe: true
+          })
+          this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self')
         }else{
           debugger
           this.$dispatch('confirm')
+          this.$dispatch('confirm')
+          this.$dispatch('confirm')
         }
-        // restp2.data[0].processname = '散户报建流程'
-        // restp2.data[0].defname  = '工程派工'
-
       }
       else{
         // console.log('-----')
@@ -713,6 +728,27 @@ export default {
         }
       }))
     },
+    // 获取集收单位
+    async getArea () {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      })
+    },
     async pcdChange () {
       if (isEmpty(this.show_data.f_pcd)) {
         return
@@ -1501,6 +1537,31 @@ export default {
         }
       }))
     },
+    // 搜索小区
+    async 'searchAreaCollective' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+              'POST',
+              `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+              {data: data},
+              {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
     // 团购转散户初始化
     'apply2ReadyEvent' () {
       if (this.show_data.f_apply_source === '线下发起') {

package/src/components/android/Process/Processes/AppAddMaterialScience.vue

@@ -141,7 +141,9 @@
               />
             </div>
           </div>
-
+          <div v-if=" (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建')">
+            <app-qrcode-reader :istype = fmaterialname  :index = i v-show="isShow[i]"></app-qrcode-reader>
+          </div>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -189,7 +191,10 @@
           }
         ],
         meterialOptions: [],
-        row: {}
+        row: {},
+        bjqChecklag:[],
+        fmaterialname:{},
+        isShow:[false]
       }
     },
     ready() {
@@ -225,9 +230,11 @@
           }
         ],
           this.showMaterialModal = true
+        this.isShow = [false]
       },
       deleteDevicesinfo(index) {
         this.materials.splice(index, 1)
+        this.isShow.splice(index, 1)
       },
       pushMaterial() {
         this.materials.push({
@@ -239,6 +246,7 @@
           f_bjq_sid: '',
           f_material_code: ''
         })
+        this.isShow.push(false)
       },
       // 获取模态框材料
       async getMateralNames() {
@@ -269,6 +277,12 @@
         this.materials[index].f_material_unit = material.f_material_unit
         this.materials[index].f_material_number = material.f_material_number
         this.materials[index].f_material_code = material.f_material_code
+        if (material.f_material_name === "报警器-汉威"){
+          this.isShow[index] = true
+        }else {
+          this.isShow[index] = false
+        }
+        this.isShow.splice(0,1,this.isShow[0])
       },
       // 新增材料
       async addMaterial() {
@@ -282,6 +296,13 @@
           f_orgname: Vue.user.orgs,
           materials:  this.materials
         }
+
+        //报警器流程 设备编号检验
+        await this.bjqCheck()
+        if (this.bjqChecklag.length > 0){
+          return
+        }
+
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
@@ -329,6 +350,13 @@
         data.f_material_number = this.materials[0].f_material_number
         data.f_material_code = this.materials[0].f_material_code
         data.f_bjq_sid = this.materials[0].f_bjq_sid
+
+        //报警器流程 设备编号检验
+        await this.bjqCheck()
+        if (this.bjqChecklag.length > 0){
+          return
+        }
+
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
@@ -344,6 +372,35 @@
       closeMaterials() {
         this.getOnetoManyData()
         this.showMaterialModal = false
+      },
+      async bjqCheck(){
+        //报警器设备型号校验
+        this.bjqChecklag = [] //初始化
+        if (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建'){
+          let bjqinfo = {
+            f_material_name : "",
+            f_bjq_sid: ""
+          }
+          for (const bjqinfoElement of this.materials) {
+            bjqinfo.f_bjq_sid = bjqinfoElement.f_bjq_sid
+            bjqinfo.f_material_name = bjqinfoElement.f_material_name
+            if (bjqinfo.f_material_name.substr(0,3) === '报警器'){
+              let http = new HttpResetClass()
+              let res = await http.load(
+                'POST',
+                // `/rs/logic/bjqcheck`,
+                `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
+                bjqinfo
+              )
+              if (res.data.code != 200){
+                this.bjqChecklag.push(res.data.code)
+                //this.$showMessage(res.data.msg)
+                Vue.showAlert(res.data.msg, 'danger', 6000)
+                return
+              }
+            }
+          }
+        }
       }
     }
   }

package/src/components/product/Process/Processes/addMaterialScience.vue

@@ -151,6 +151,7 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
   export default {
     name: 'addMaterialScience',
     props: {
@@ -177,7 +178,8 @@
           }
         ],
         meterialOptions:[],
-        row:{}
+        row:{},
+        bjqChecklag:[]
       }
     },
     ready(){
@@ -269,6 +271,12 @@
           f_orgname: this.$login.f.orgs,
           materials:this.materials
         }
+        //报警器流程 设备编号检验
+        await this.bjqCheck()
+        console.log("这是bjqChecklag数据:",this.bjqChecklag)
+        if (this.bjqChecklag.length > 0){
+          return
+        }
         let res = await this.$resetpost(
           `rs/logic/saveMaterials`,
           data
@@ -315,6 +323,11 @@
         data.f_material_number = this.materials[0].f_material_number
         data.f_material_code = this.materials[0].f_material_code
         data.f_bjq_sid = this.materials[0].f_bjq_sid
+        //报警器流程 设备编号检验
+        await this.bjqCheck()
+        if (this.bjqChecklag.length > 0){
+          return
+        }
         let res = await this.$resetpost(
           `rs/entity/t_material_apply`,
           data
@@ -328,6 +341,35 @@
       closeMaterials () {
         this.getOnetoManyData()
         this.showMaterialModal = false
+      },
+      async bjqCheck(){
+        //报警器设备型号校验
+        this.bjqChecklag = [] //初始化
+        if (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建'){
+          let bjqinfo = {
+            f_material_name : "",
+            f_bjq_sid: ""
+          }
+          for (const bjqinfoElement of this.materials) {
+            bjqinfo.f_bjq_sid = bjqinfoElement.f_bjq_sid
+            bjqinfo.f_material_name = bjqinfoElement.f_material_name
+            if (bjqinfo.f_material_name.substr(0,3) === '报警器'){
+              let http = new HttpResetClass()
+              let res = await http.load(
+                'POST',
+                // `/rs/logic/bjqcheck`,
+                `ncc/rs/logic/bjqcheck`,
+                bjqinfo
+              )
+              if (res.data.code != 200){
+                this.bjqChecklag.push(res.data.code)
+                // this.$showMessage(res.data.msg)
+                Vue.showAlert(res.data.msg, 'danger', 6000)
+                return
+              }
+            }
+          }
+        }
       }
     }
   }

package/src/components/product/Process/Service/ServiceControl.vue

@@ -480,7 +480,7 @@ export default {
         }
       })
     },
-    // 获取区县
+    // 获取集收单位
     async getArea () {
       let data = {
         tablename: 't_area',
@@ -984,6 +984,31 @@ export default {
         }
       }))
     },
+    // 搜索小区
+    async 'searchAreaCollective' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
     // 选择气价
     'priceChange' (index) {
       debugger
@@ -1476,10 +1501,10 @@ export default {
           this.$showMessage('请添加报警器物料信息!!!')
           return
         }
-        // if (numOne.length > 1){
-        //   this.$showMessage("暂时支持单个报警器物料安装!!!")
-        //   return
-        // }
+        if (numOne.length > 1){
+          this.$showMessage("暂时支持单个报警器物料安装!!!")
+          return
+        }
         datatemp.sqvalue = this.show_data.areaData.sqvalue
         datatemp.f_bjq_baidu_lng = this.show_data.templatlng.baidutemplng
         datatemp.f_bjq_baidu_lat = this.show_data.templatlng.baidutemplat