apply-clients 3.3.110-214 → 3.3.110-217

package/package.json

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

package/src/components/android/AppServiceView.vue

@@ -58,7 +58,6 @@
                  v-model="data.fields[index].value"
                  :placeholder="item.placeholder"
                  :value="data.fields[index].value"
-                 onKeypress="return(/[\d\.]/.test(String.fromCharCode(event.keyCode)))"
                  :readonly="item.readonly"
                  v-validate:f_idnumber2='{identityCardValid: true}'
                  @change="onchange(index)"

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

@@ -181,6 +181,23 @@ export default {
           }
         }
       }
+      if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && (this.show_data.button.button_name === '提交'||this.show_data.button.button_name === '保存')){
+        let dataz = {
+          condition: `u.id = ${this.show_data.id}`,
+          data: {
+            id: Vue.user.id,
+            orgid: Vue.user.orgid
+          }
+        }
+        let http = new HttpResetClass()
+        let restpz = await http.load(
+          'POST',
+          `rs/sql/checkuser`,
+          {data: dataz},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        this.show_data.actid=restpz.data[0].actid
+      }
       let res = await this.$resetpost(
         // `rs/logic/ApplyProductService`,
         `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,

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

@@ -480,6 +480,27 @@ export default {
         }
       })
     },
+    // 获取区县
+    async getArea () {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${this.$login.f.orgid}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      })
+    },
     // 缴费前置
     chargeBefore () {
       if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
@@ -779,14 +800,9 @@ export default {
       const dir = upperCaseChars(this.$login.f.orgs) //分公司
 
       let type = 0   //类型
-      let entry_type = ''
-      if(this.show_data.f_apply_type === '团购报建') {
-        entry_type = this.show_data.f_apply_nature
-      }else {
-        entry_type = this.show_data.f_entry_type
-      }
-      switch (entry_type){
-        case '城区':
+
+      switch (this.show_data.f_entry_type){
+        case '城区/县城':
           type = 1  // 当表达式的结果等于 城区 时，则执行该代码
           break;
         case '新农村':
@@ -797,7 +813,7 @@ export default {
       }
 
       let nature = 0    // 性质
-      switch (this.show_data.f_new_entry){
+      switch (this.show_data.f_apply_nature){
         case '房产':
           nature = 1  // 当表达式的结果等于 房产 时，则执行该代码
           break;
@@ -807,6 +823,15 @@ export default {
         case '商业':
           nature = 3  // 当表达式的结果等于 商业 时，则执行该代码
           break;
+        case '学校':
+          nature = 3  // 当表达式的结果等于 学校 时，则执行该代码
+          break;
+        case '福利机构':
+          nature = 3  // 当表达式的结果等于 福利机构 时，则执行该代码
+          break;
+        case '其他':
+          nature = 3  // 当表达式的结果等于 其他 时，则执行该代码
+          break;
         case '工业':
           nature = 4  // 当表达式的结果等于 工业 时，则执行该代码
           break;
@@ -822,10 +847,15 @@ export default {
       const newYear = date.year + 1
       const year = date.year.toString().substring(2,4) //年份
 
-
+      let data = {
+        dataYm: dataYm,
+        newYear: newYear,
+        orgid: this.$login.f.orgid,
+        condition: `and f_apply_nature = '${this.show_data.f_apply_nature}'`
+      }
 
       let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/contractCount', {data: {dataYm: dataYm, newYear: newYear, orgid: this.$login.f.orgid}}, {
+      let res = await http.load('POST', 'rs/sql/contractCount', {data:data}, {
         resolveMsg: null,
         rejectMsg: null
       })
@@ -1486,6 +1516,23 @@ export default {
         && (this.show_data.defname === '报装申请')){
         await this.contract_number()
       }
+      if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && (this.show_data.button.button_name === '保存'||this.show_data.button.button_name === '提交')){
+        let dataz = {
+          condition: `u.id = ${this.show_data.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }
+        let http = new HttpResetClass()
+        let restpz = await http.load(
+          'POST',
+          `rs/sql/checkuser`,
+          {data: dataz},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        this.show_data.actid=restpz.data[0].actid
+      }
       let res = await this.$resetpost(
         `rs/logic/ApplyProductService`,
         {data: this.show_data},
@@ -1496,6 +1543,52 @@ export default {
       if (this.show_data.button.after) {
         this[this.show_data.button.after]()
       }
+//改管报建 增容报建 优化
+      if((this.show_data.f_apply_type === '改管报建'||this.show_data.f_apply_type === '增容报建') && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '缴费'){
+        let datagg = {
+          tablename: 't_apply',
+          condition: `f_process_id='${this.show_data.f_process_id}'`
+        }
+        let http = new HttpResetClass()
+        let restgg = await http.load(
+          'POST',
+          `rs/sql/singleTable`,
+          {data: datagg},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        debugger
+        if(this.show_data.f_apply_type === '改管报建'){
+          restgg.data[0].processname = '改管报建流程'
+          restgg.data[0].defname = '报装缴费'
+        }else{
+          restgg.data[0].processname = '增容报建'
+          restgg.data[0].defname = '报装缴费'
+        }
+
+        this.$dispatch('apply',restgg.data[0])
+
+      }
+
+      // 退款报建 优化
+      if(this.show_data.f_apply_type === '退款报建' && this.show_data.defname === '终止报建' && this.show_data.button.button_name === '提交'){
+        let datatk = {
+          tablename: 't_apply',
+          condition: `f_process_id='${this.show_data.f_process_id}'`
+        }
+        let http = new HttpResetClass()
+        let resttk = await http.load(
+          'POST',
+          `rs/sql/singleTable`,
+          {data: datatk},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        debugger
+        resttk.data[0].processname = '退款报建流程'
+        resttk.data[0].defname = '退款'
+        this.$dispatch('apply',resttk.data[0])
+
+      }
+
 
       if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '合同'){
         let data = {

package/src/components/product/ServiceView.vue

@@ -47,7 +47,7 @@
               />
             </div>
           </div>
-
+          <!--身份证验证-->
           <div :style="item.style ? item.style+';height: 40px;margin-bottom: 20px':'height: 40px;margin-bottom: 20px'"
                v-if="(item.label==='身份证') || (data.f_credentials === '身份证' && item.label === '证件号码')"
                :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '',item.bootstraped ? item.bootstraped + ' form-group':'col-sm-4 form-group']">
@@ -60,7 +60,6 @@
                      maxlength="18"
                      v-model="data.fields[index].value"
                      :placeholder="item.placeholder"
-                     onKeypress="return(/[\d\.]/.test(String.fromCharCode(event.keyCode)))"
                      :value="data.fields[index].value"
                      v-validate:f_idnumber2='{identityCardValid: true}'
                      :readonly="item.readonly"