apply-clients 3.3.10 → 3.3.14

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

@@ -350,7 +350,9 @@ export default {
         userid: this.$login.f.id
       }
 
-      let res = await this.$resetpost(
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
         `rs/search`,
         {data: data},
         {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
@@ -369,7 +371,9 @@ export default {
         tablename: 't_pcd',
         condition: `f_filialeid = '${this.$login.f.orgid}'`
       }
-      let res = await this.$resetpost(
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
         `rs/sql/singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
@@ -421,7 +425,9 @@ export default {
         tablename: 't_dev_info',
         condition: `f_orgid = '${this.$login.f.orgid}'`
       }
-      let res = await this.$resetpost(
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
         `rs/sql/singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
@@ -433,9 +439,51 @@ export default {
           value: item.f_dev_name
         }
       })
+    },
+    async getPrice (f_price_id) {
+      console.log('=======================')
+      console.log(f_price_id)
+
+      let data = {
+        condition: `sp.f_orgid = '${this.$login.f.orgid}'`
+      }
+
+      if (!isEmpty(f_price_id)) {
+        data.condition = `sp.f_orgid = '${this.$login.f.orgid}' and sp.f_price_id = ${f_price_id}`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/applyGetPrice`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '气价查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_price_name,
+          value: item
+        }
+      })
     }
   },
   events: {
+    // 选择气价
+    'priceChange' (index) {
+      if (isEmpty(this.show_data.stairPrice)) {
+        return
+      }
+
+      let stairPrice = this.getLableValue('气价名称')
+
+      this.setLabelValue('气价类型', stairPrice.f_price_type)
+      this.setLabelValue('用气性质', stairPrice.f_gasproperties)
+      this.setLabelValue('价格', stairPrice.f_price)
+      this.setLabelValue('客户类型', stairPrice.f_user_type)
+
+      this.show_data.f_price_id = stairPrice.f_price_id
+      this.show_data.f_price_name = stairPrice.f_price_name
+    },
     // 选择开发商
     async 'devInfoChange' (index) {
       if (isEmpty(this.show_data.f_company_name)) {
@@ -515,6 +563,7 @@ export default {
         }
       }
     },
+    // 终止报建初始化
     async 'stopApplyReadyEvent' () {
 
       let f_is_stop = this.getLableValue('是否终止')
@@ -563,8 +612,11 @@ export default {
       this.show_data.f_userinfo_code = row.f_userinfo_code
     },
     // 是否购买保险
-    isInsureChange (index) {
-      let f_is_insure = this.getLableValue('是否购买保险')
+    async 'isInsureChange' (index) {
+      if (!this.show_data.f_is_insure) {
+        return
+      }
+      let f_is_insure = this.show_data.f_is_insure
       for (const item of this.show_data.fields) {
         if (f_is_insure === '是') {
           if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
@@ -587,7 +639,48 @@ export default {
     },
     // 通气点火初始化
     async 'gasReadyEvent' () {
-      // 初始化显示内容
+      // 是否有气价信息
+      if (!isEmpty(this.show_data.f_price_id)) {
+        let priceList = await this.getPrice(this.show_data.f_price_id)
+        this.setLabelValue('气价名称', priceList[0].value)
+      }
+
+      let data = {
+        tablename: 't_userfees',
+        condition: `f_orgid = '${this.$login.f.orgid}' and f_userinfo_id = '${this.show_data.f_userinfo_id}' and f_state = '待执行'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '保险查询失败！！！'}
+      )
+      if (res.data.length > 0) {
+
+        this.setLabelValue('待执行保险', '是')
+        for (const item of this.show_data.fields) {
+          if (item.label === '是否购买保险' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '保费开始日期') {
+            item.hidden = false
+            item.required = true
+          }
+        }
+      } else {
+        this.setLabelValue('待执行保险', '否')
+        for (const item of this.show_data.fields) {
+          if (item.label === '是否购买保险' || item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
+            item.hidden = false
+            item.required = true
+          }
+        }
+      }
+
+      // 保险初始化显示内容
       let f_is_insure = this.getLableValue('是否购买保险')
       for (const item of this.show_data.fields) {
         if (f_is_insure === '是') {
@@ -598,7 +691,13 @@ export default {
           if (item.label === '保险备注') {
             item.hidden = false
           }
-        } else {
+          // 本期保费到期时间默认一年
+          if (isEmpty(this.selectdata.f_ins_expiration_date)) {
+            let f_ins_expiration_date = new Date().setFullYear(new Date().getFullYear() + 1)
+            this.setLabelValue("保费结束日期", new Date(f_ins_expiration_date).Format('yyyy-MM-dd'))
+          }
+        }
+        if (f_is_insure === '否') {
           if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
             item.hidden = true
             item.required = false
@@ -608,11 +707,6 @@ export default {
           }
         }
       }
-      // 本期保费到期时间默认一年
-      if (isEmpty(this.selectdata.f_ins_expiration_date)) {
-        let f_ins_expiration_date = new Date().setFullYear(new Date().getFullYear() + 1)
-        this.setLabelValue("保费结束日期", new Date(f_ins_expiration_date).Format('yyyy-MM-dd'))
-      }
     },
     // 合同金额失去焦点
     async 'contractMoneyChange' (index) {
@@ -635,19 +729,21 @@ export default {
         return
       }
 
-      this.setLabelValue('小区', null)
+      this.setLabelValue('集收单位', null)
 
       let data = {
         tablename: 't_area',
         condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
       }
-      let res = await this.$resetpost(
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
       )
 
-      this.setLabelOptions('小区', res.data.map(item => {
+      this.setLabelOptions('集收单位', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
@@ -660,20 +756,33 @@ export default {
         return
       }
 
-      this.setLabelValue('街道', null)
-      this.setLabelValue('小区', null)
+      this.setLabelValue('街道/乡镇', null)
+      this.setLabelValue('集收单位', null)
+
+
 
       let data = {
         tablename: 't_street',
         condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
       }
-      let res = await this.$resetpost(
+      let f_address_type = this.getLableValue('地址类型')
+
+      if (f_address_type === '民用市区') {
+        data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+      }
+      if (f_address_type === '民用乡镇') {
+        data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '街道查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
       )
 
-      this.setLabelOptions('街道', res.data.map(item => {
+      this.setLabelOptions('街道/乡镇', res.data.map(item => {
         return {
           label: item.f_street,
           value: item.f_street
@@ -684,71 +793,63 @@ export default {
     'addressTypeChange' (index) {
       let f_address_type = this.show_data.fields[index].value
       for (const item of this.show_data.fields) {
-        if (f_address_type === '民用城区') {
-          if (item.label === '区/县' || item.label === '街道' || item.label === '小区' || item.label === '门牌号(号)') {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
             item.value = null
           }
-          if (item.label === '楼号(乡/镇)' || item.label === '单元(村)' || item.label === '楼层(组)') {
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
             item.hidden = false
             item.required = false
             item.value = null
           }
-        }
-        if (f_address_type === '民用农村') {
-          if (item.label === '楼层(组)' ||item.label === '门牌号(号)') {
-            item.hidden = false
-            item.required = false
-            item.value = null
-          }
-          if (item.label === '区/县' || item.label === '楼号(乡/镇)' || item.label === '单元(村)') {
-            item.hidden = false
-            item.required = true
-            item.value = null
-          }
-          if (item.label === '街道' || item.label === '小区') {
-            item.hidden = true
-            item.required = false
+          if (item.label === '地址') {
+            item.readonly = true
             item.value = null
           }
         }
-        if (f_address_type === '特殊城区') {
-          if (item.label === '区/县' || item.label === '街道') {
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
             item.value = null
           }
-          if (item.label === '小区') {
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
             item.hidden = false
             item.required = false
             item.value = null
           }
-          if (item.label === '楼号(乡/镇)' || item.label === '单元(村)' || item.label === '楼层(组)' ||item.label === '门牌号(号)') {
+          if (item.label === '楼层') {
             item.hidden = true
             item.required = false
             item.value = null
           }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
         }
-        if (f_address_type === '特殊农村') {
-          if (item.label === '区/县') {
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
             item.hidden = false
             item.required = true
             item.value = null
           }
-          if (item.label === '楼号(乡/镇)') {
+          if (item.label === '集收单位') {
             item.hidden = false
             item.required = false
             item.value = null
           }
-          if (item.label === '街道' || item.label === '小区' || item.label === '单元(村)' || item.label === '楼层(组)' ||item.label === '门牌号(号)') {
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
             item.hidden = true
             item.required = false
             item.value = null
           }
-        }
-        if (item.label === '地址') {
-          item.value = null
+          if (item.label === '地址') {
+            item.readonly = false
+            item.value = null
+          }
         }
       }
     },
@@ -759,49 +860,52 @@ export default {
       let f_address_type = this.show_data.f_address_type
 
       for (const item of this.show_data.fields) {
-        if (f_address_type === '民用城区') {
-          if (item.label === '区/县' || item.label === '街道' || item.label === '小区' || item.label === '门牌号(号)') {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '楼号(乡/镇)' || item.label === '单元(村)' || item.label === '楼层(组)') {
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
             item.hidden = false
             item.required = false
           }
-        }
-        if (f_address_type === '民用农村') {
-          if (item.label === '区/县' || item.label === '楼号(乡/镇)' || item.label === '单元(村)' || item.label === '楼层(组)' ||item.label === '门牌号(号)') {
-            item.hidden = false
-            item.required = true
-          }
-          if (item.label === '街道' || item.label === '小区') {
-            item.hidden = true
-            item.required = false
+          if (item.label === '地址') {
+            item.readonly = true
           }
         }
-        if (f_address_type === '特殊城区') {
-          if (item.label === '区/县' || item.label === '街道') {
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '小区') {
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
             item.hidden = false
             item.required = false
           }
-          if (item.label === '楼号(乡/镇)' || item.label === '单元(村)' || item.label === '楼层(组)' ||item.label === '门牌号(号)') {
+          if (item.label === '楼层') {
             item.hidden = true
             item.required = false
           }
+          if (item.label === '地址') {
+            item.readonly = true
+          }
         }
-        if (f_address_type === '特殊农村') {
-          if (item.label === '区/县') {
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '街道' || item.label === '小区' || item.label === '楼号(乡/镇)' || item.label === '单元(村)' || item.label === '楼层(组)' ||item.label === '门牌号(号)') {
+          if (item.label === '集收单位') {
+            item.hidden = false
+            item.required = false
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
             item.hidden = true
             item.required = false
           }
+          if (item.label === '地址') {
+            item.readonly = false
+          }
         }
 
         if (this.show_data.f_apply_source === '线下发起' && item.label === '预约地址') {
@@ -839,41 +943,28 @@ export default {
     'onchange' (index) {
       if (this.show_data.defname === '报装申请') {
         if (
-          this.show_data.fields[index].label === '街道' ||
-          this.show_data.fields[index].label === '小区' ||
-          this.show_data.fields[index].label === '楼号(乡/镇)' ||
-          this.show_data.fields[index].label === '单元(村)' ||
-          this.show_data.fields[index].label === '楼层(组)' ||
-          this.show_data.fields[index].label === '门牌号(号)'
+          this.show_data.fields[index].label === '区/县' ||
+          this.show_data.fields[index].label === '街道/乡镇' ||
+          this.show_data.fields[index].label === '集收单位' ||
+          this.show_data.fields[index].label === '楼号/组' ||
+          this.show_data.fields[index].label === '单元/排' ||
+          this.show_data.fields[index].label === '楼层' ||
+          this.show_data.fields[index].label === '门牌号'
         ) {
 
           let f_pcd = this.getLableValue('区/县') || ''
-          let f_street = this.getLableValue('街道')
-          let f_residential_area = this.getLableValue('小区')
-          let f_building = this.getLableValue('楼号(乡/镇)')
+          let f_street = this.getLableValue('街道/乡镇') || ''
+          let f_residential_area = this.getLableValue('集收单位') || ''
+          let f_building = this.getLableValue('楼号/组') || ''
           let f_building_suffix = f_building ? this.config.f_building_suffix : ''
-          let f_unit = this.getLableValue('单元(村)')
+          let f_unit = this.getLableValue('单元/排') || ''
           let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
-          let f_floor = this.getLableValue('楼层(组)')
+          let f_floor = this.getLableValue('楼层') || ''
           let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
-          let f_room = this.getLableValue('门牌号(号)')
+          let f_room = this.getLableValue('门牌号') || ''
           let f_room_suffix = f_room ? this.config.f_room_suffix : ''
 
-          let f_address = null
-
-          let f_address_type = this.show_data.f_address_type
-          if (f_address_type === '民用城区') {
-            f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
-          }
-          if (f_address_type === '民用农村') {
-            f_address = f_pcd + f_building + f_unit + f_floor + f_room
-          }
-          if (f_address_type === '特殊城区') {
-            f_address = f_pcd + f_street + f_residential_area
-          }
-          if (f_address_type === '特殊农村') {
-            f_address = f_pcd
-          }
+          let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
           this.setLabelValue("地址", f_address)
         }
       }

package/src/components/product/Process/ShowBackReason.vue

@@ -1,29 +1,33 @@
-<template>
-  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
-      <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
-  </div>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '退回原因展示',
-    props: ['selectdata'],
-    data () {
-      return {
-        data: null
-      }
-    },
-    async ready () {
-      let data = {
-        tablename: 't_backcause',
-        condition: `actid = '${this.selectdata.actid}' and f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      let res = await this.$resetpost('rs/sql/singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '退回原因查询失败！！！'
-      })
-      this.data = res.data[0]
-    }
-  }
-</script>
+<template>
+  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
+      <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
+  </div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '退回原因展示',
+    props: ['selectdata'],
+    data () {
+      return {
+        data: null
+      }
+    },
+    async ready () {
+      let data = {
+        tablename: 't_backcause',
+        condition: `actid = '${this.selectdata.actid}' and f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        'rs/sql/singleTable',
+        {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '退回原因查询失败！！！'
+      })
+      this.data = res.data[0]
+    }
+  }
+</script>

package/src/components/product/Stop/StopApplyList.vue

@@ -20,11 +20,10 @@
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
             </div>
-
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
@@ -37,11 +36,6 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
-            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">联系电话：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
@@ -115,7 +109,6 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">报建编号</th>
-            <th style="white-space: nowrap;">项目名称</th>
             <th style="white-space: nowrap;">客户名称</th>
             <th style="white-space: nowrap;">联系人</th>
             <th style="white-space: nowrap;">电话</th>
@@ -140,9 +133,6 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_entry_name}}</nobr>
-            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>