apply-clients 3.4.7 → 3.4.9

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://192.168.50.4:8400'
-var applyinstall = 'http://192.168.50.4:8400'
+var ldap = 'http://117.33.181.102:8400/'
+var applyinstall = 'http://117.33.181.102:8400/'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

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

package/src/apply.js

@@ -4,7 +4,7 @@ import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
 import ApplyLoadParams from './stores/ApplyLoadParams'
 /** ****************服务插件*********************/
 
-export default function () {
+export default function (filiale) {
   Vue.use(ApplyGetSaleParam)
   Vue.use(ApplyLoadParams)
 /** ***************************报建模块*********************************/
@@ -103,4 +103,11 @@ export default function () {
   Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
   // 地图组件
   Vue.component('gaode-map', (resolve) => { require(['./components/product/GaoDeMapComponents/GaoDeMap'], resolve) })
+
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
 }

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

@@ -269,11 +269,10 @@ export default {
       applytype:[],
       showModal: false,
       applyType: '',  // 报建类型
-      // applyTypes:this.$appdata.getParam("手机报建类型"),
-      applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'}],
+      applyTypes:[],
+      // applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'}],
       criteriaShow: false,
-
-     //  applytype: [{label: '全部', value: ''}, {label:'散户报建',value:'散户报建'}  ], // 所有报建类型
+     //  applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
       defnames: [{label: '全部', value: ''}],
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       laterList: [
@@ -288,6 +287,7 @@ export default {
     //this.$refs.cp.$refs.cri.model.defname='报装缴费'
     //this.$refs.cp.$refs.cri.model.defname='合同签订'
    this.applytype =[{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]// 所有报建类型
+    this.applyTypes=this.$appdata.getParam("手机报建类型")
 
   },
   methods: {

package/src/filiale/guangxi/android.js

@@ -0,0 +1,14 @@
+let specialComp = {
+  'app-service-control': (resolve) => { require(['./android/Process/AppServiceControl'], resolve) },
+  'app-installation-details': (resolve) => { require(['./android/Process/Processes/AppInstallationDetails'], resolve) },
+  'app-installation-details-civil': (resolve) => { require(['./android/Process/Processes/AppInstallationDetailsCivil'], resolve) },
+  'survey-tsak': (resolve) => { require(['./android/Task/Survey/SurveyTsak'], resolve) },
+  'build-tsak': (resolve) => { require(['./android/Task/Build/BuildTsak'], resolve) },
+
+  'app-sign-task': (resolve) => { require(['./android/Sign/AppSignTask'], resolve) },
+  'build-sign': (resolve) => { require(['./android/Sign/BuildSign'], resolve) },
+  'design-sign': (resolve) => { require(['./android/Sign/DesignSign'], resolve) },
+  'construct-sign': (resolve) => { require(['./android/Sign/ConstructSign'], resolve) },
+  'supervisor-sign': (resolve) => { require(['./android/Sign/SupervisorSign'], resolve) }
+}
+exports.specialComp = specialComp

package/src/filiale/guangxi/pc/ApplyCharge/ApplyChargeList.vue

@@ -0,0 +1,470 @@
+<template>
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">组织机构：</label>
+              <res-select
+                restype='organization'
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                :is-mul="false"
+              ></res-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_date <= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3 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>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/applyExportfile"
+                            sql-name="getApplyCharge"
+                            template-name='收费记录信息导出'
+                            :choose-col="true"></export-excel>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </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" placeholder='工程编号' v-model="model.f_apply_num"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.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" placeholder='合同编号' v-model="model.f_contract_number"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.f_contract_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='请选择'
+                condition="a.f_apply_type = '{}'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="a.f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </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_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.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"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.f_phone like '%{}%'">
+            </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_address"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.f_address like '%{}%'">
+            </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_idnumber"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.f_idnumber like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">缴费编码：</label>
+              <input type="text" class="input_search" style="width: 60%" placeholder='缴费编码' v-model="model.f_charge_number"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="cr.f_charge_number like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">付款方式：</label>
+              <v-select
+                v-model="model.f_payment_method"
+                placeholder='请选择'
+                condition="cr.f_payment_method = '{}'"
+                :value.sync="model.f_payment_method"
+                :options='$parent.$parent.paymentMethod'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">收费项目：</label>
+              <v-select
+                v-model="model.f_payment_term"
+                placeholder='请选择'
+                condition="cr.f_payment_term = '{}'"
+                :value.sync="model.f_payment_term"
+                :options='$parent.$parent.paymentTerm'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">流&ensp;水&ensp;号：</label>
+              <input type="text" style="width: 60%" class="input_search" placeholder='流水号' v-model="model.f_payer_number"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="cr.f_payer_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">部&emsp;&emsp;门：</label>
+              <res-select
+                restype='department'
+                :parentresid="$parent.$parent.curorgid"
+                :initresid='$parent.$parent.curdepid'
+                @res-select="$parent.$parent.getdep"
+                :is-mul="true"
+              ></res-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">人&emsp;&emsp;员：</label>
+              <res-select
+                restype='user'
+                :parentresid="$parent.$parent.curdepid"
+                :initresid='$parent.$parent.curuserid'
+                @res-select="$parent.$parent.getuser"
+                :is-mul="true"></res-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">缴费状态：</label>
+              <v-select
+                v-model="model.f_charge_status"
+                placeholder='请选择'
+                condition="cr.f_charge_status = '{}'"
+                :value.sync="model.f_charge_status"
+                :options='$parent.$parent.chargeStatus'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">服务人：</label>
+              <v-select
+                v-model="model.f_servicer"
+                placeholder='请选择'
+                condition="a.f_servicer = '{}'"
+                :value.sync="model.f_servicer"
+                class="select select_list"
+                :options='$parent.$parent.servicerList'
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建发起人：</label>
+              <v-select
+                v-model="model.f_operator"
+                placeholder='请选择'
+                condition="a.f_operator = '{}'"
+                :value.sync="model.f_operator"
+                class="select select_list"
+                :options='$parent.$parent.operatorList'
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+        <template partial='head'>
+          <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>
+            <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>
+            <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>
+            <th style="white-space: nowrap;">实际收费时间</th>
+            <th style="white-space: nowrap;">状态</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr >
+            <td style="text-align: center;">
+              <nobr><font>{{$index+1}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_num}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_contract_number}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_type}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_nature}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_user_name}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_phone}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_idnumber}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_number}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_payment_term}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_money}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_payment_method}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_payer_number}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_servicer}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_operator}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_collectors}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_date}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_actual_date}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_status}}</font></nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../../../components/Util";
+export default {
+  title: '报建收费列表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
+        f_charge_money: 0
+      }),
+      curorgid: [this.$login.f.orgid],
+      curdepid: [],
+      servicerList:[],
+      operatorList:[],
+      curuserid: [],
+      // paymentTerm :[{label: '全部', value: ''}, ...this.$appdata.getParam('收费项目')],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      chargeStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
+      ],
+      criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_contract_number': '合同编号',
+        'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
+        'f_user_name': '用户名称',
+        'f_phone': '用户电话',
+        'f_address': '用户地址',
+          'f_idnumber': '身份证号',
+        'f_charge_number': '缴费编码',
+        'f_charge_money': '收费金额',
+        'f_payment_method': '付款方式',
+        'f_payer_number': '流水号',
+        'f_charge_collectors': '收费人员',
+        'f_charge_date': '收费日期',
+        'f_actual_date': '实际收费时间',
+        'f_charge_status': '状态'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+    this.getservicer()
+    this.getapplyoperator()
+  },
+  methods: {
+   async getservicer(){
+      debugger
+      let data = {
+        tablename: 't_user',
+        condition: `1=1`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '服务人查询失败！！！'}
+      )
+      res.data.forEach(item => {
+         this.servicerList.push({
+             'label': item.name,
+              'value': item.name
+     })
+})},
+
+    async getapplyoperator(){
+      debugger
+      let data = {
+        condition: `1=1`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/getapplyOperator', {data: data}, {resolveMsg: null, rejectMsg: null})
+      res.data.forEach(item => {
+        this.operatorList.push({
+          'label': item.f_operator,
+          'value': item.f_operator
+        })
+      })},
+
+    applyTypeChange () {
+      if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+        this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+      } else {
+        this.applyNatures = [{label: '全部', value: ''}]
+      }
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+      this.curdepid = []
+      this.curuserid = []
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and cr.f_orgid in (${this.curorgid})`
+      if (this.curdepid.length > 0) {
+        args.condition = args.condition + ` and cr.f_depid in (${this.curdepid})`
+      }
+      if (this.curuserid.length > 0) {
+        args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
+      }
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+      this.getChargeAll()
+      this.getapplyoperator()
+    },
+    async getChargeAll () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: this.model.condition
+      }
+      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
+
+      this.chargeAll = res.data[0]
+    },
+    getuser (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curuserid = val
+      this.search()
+    },
+    getdep (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curdepid = val
+      this.curuserid = []
+      this.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.curdepid = []
+      this.curuserid = []
+      this.search()
+    },
+
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/filiale/guangxi/pc/ApplyCharge/ApplyChargeSearch.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div style="height: 95%">
+        <apply-charge-list v-ref:query ></apply-charge-list>
+      </div>
+      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
+        合计记录共<span style="color: red">&ensp;{{$refs.query.chargeAll.count}}&ensp;</span>笔，
+        合计金额<span style="color: red">&ensp;{{$refs.query.chargeAll.sum}}&ensp;</span>元
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '报建收费明细',
+  data () {
+    return {
+    }
+  },
+  ready () {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+</style>