apply-clients 3.4.2 → 3.4.4

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -1,12 +1,16 @@
 <template>
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+      <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>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
+              <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>
@@ -14,7 +18,7 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
                           condition="cr.f_charge_date >= '{}'">
               </datepicker>
@@ -25,7 +29,7 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
                           condition="cr.f_charge_date <= '{}'">
               </datepicker>
@@ -49,8 +53,8 @@
           </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"
+              <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>
@@ -70,13 +74,49 @@
                 :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>
-              <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_charge_collectors"
+              <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="cr.f_charge_collectors like '%{}%'">
+                     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>
@@ -90,15 +130,76 @@
                 :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_charging_status"
+                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="cr.f_charging_status = '{}'"
-                :value.sync="model.f_charging_status"
-                :options='$parent.$parent.chargingStatus'
+                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>
@@ -108,18 +209,26 @@
       <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
         <template partial='head'>
           <tr>
-            <th>序号</th>
-            <th>报建编号</th>
-            <th>项目名称</th>
-            <th>合同编号</th>
-            <th>报建类型</th>
-            <th>缴费编码</th>
-            <th>收费金额</th>
-            <th>付款方式</th>
-            <th>收费人员</th>
-            <th>收费日期</th>
-            <th>状态</th>
-            <th>地址</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>
+            <th style="white-space: nowrap;">状态</th>
           </tr>
         </template>
         <template partial='body'>
@@ -130,24 +239,48 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_entry_name}}</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>
@@ -155,10 +288,10 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charging_status}}</font></nobr>
+              <nobr><font>{{row.f_actual_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_address}}</font></nobr>
+              <nobr><font>{{row.f_charge_status}}</font></nobr>
             </td>
           </tr>
         </template>
@@ -169,23 +302,28 @@
 <script>
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../Util";
 export default {
   title: '报建收费列表',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }, {
+      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('付款方式')],
-      chargingStatus: [
+      chargeStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'}
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
       ],
       criteriaShow: false,
       chargeAll: {
@@ -193,54 +331,135 @@ export default {
         sum: 0
       },
       getfield: {
-        'f_apply_num': '报建编号',
-        'f_entry_name': '项目名称',
+        '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_charging_status': '状态',
-        'f_address': '地址'
+        '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.$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,
-        data: {
-          orgid: this.$login.f.orgid
-        }
+        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.$refs.cp.$refs.cri.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
+        condition: this.model.condition
       }
     }
   }

package/src/components/product/ApplyCharge/ApplyChargeSearch.vue

@@ -4,9 +4,9 @@
       <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">{{$refs.query.chargeAll.count}}</span>笔，
-        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
+      <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>