apply-clients 3.3.2 → 3.3.6

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

@@ -0,0 +1,468 @@
+<template>
+  <div>
+    <div class="col-sm-12 col-xs-12 form-group app-btn">
+      <button class="btn btn-info" @click.prevent="showChargeModal()">新增收费</button>
+    </div>
+    <div class="col-sm-12 col-xs-12">
+      <list :model="model" partial='list'>
+        <div partial class="auto app-text panel">
+          <div class="panel-body panel-self">
+            <div class="row" v-if="selectdata.f_apply_type !== '开发商集体报建'">
+              <p class="col-xs-4 text-left font"><b>地址</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_useraddres }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>缴费编号</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_charge_number }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>收费金额</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_charge_money }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>金额大写</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_amount_words }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>收费项目</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_payment_term }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>付款方式</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_payment_method }}</p>
+            </div>
+            <div class="row" v-if="row.f_payment_method === '银行转账'">
+              <p class="col-xs-4 text-left font"><b>付款方名称</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_payer_name }}</p>
+            </div>
+            <div class="row" v-if="row.f_payment_method === '银行转账'">
+              <p class="col-xs-4 text-left font"><b>付款方账号</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_payer_account }}</p>
+            </div>
+            <div class="row" v-if="row.f_payment_method === '银行转账'">
+              <p class="col-xs-4 text-left font"><b>付款流水号</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_payer_number }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>收费人员</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_charge_collectors }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>收费日期</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_charge_date }}</p>
+            </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>备注</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_charge_remarks }}</p>
+            </div>
+          </div>
+        </div>
+      </list>
+    </div>
+
+    <modal v-if="showCharge" :show.sync="showCharge" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">收费明细</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group row vertical-center" :class="charge.f_payment_term ? '':'has-error'">
+          <label class="col-xs-4 control-label">收费项目：</label>
+          <div class="col-xs-8">
+            <input-select class="select select_list"
+                          v-model="charge.f_payment_term"
+                          :value.sync="charge.f_payment_term"
+                          :options='paymentTerm'
+                          :value-single="true"
+                          close-on-select ></input-select>
+          </div>
+        </div>
+        <div class="form-group row vertical-center" :class="charge.f_charge_money ? '':'has-error'">
+          <label class="col-xs-4 control-label">收费金额：</label>
+          <div class="col-xs-8">
+            <input class="form-control input_view" style="" type="number"
+                   v-model="charge.f_charge_money"
+                   @keyup="handleInput"
+                   @change="moneyChange"
+                   :readonly="false"/>
+          </div>
+        </div>
+        <div class="form-group row vertical-center">
+          <label class="col-xs-4 control-label">金额大写：</label>
+          <div class="col-xs-8">
+            <input class="form-control input_view" style=""
+                   v-model="charge.f_amount_words"
+                   :value="smalltoBIG(0)"
+                   :readonly="true"/>
+          </div>
+        </div>
+        <div class="form-group row vertical-center">
+          <label class="col-xs-4 control-label">应交总金额：</label>
+          <div class="col-xs-8">
+            <input class="form-control input_view" style=""
+                   v-model="selectdata.f_due_money"
+                   :readonly="true"/>
+          </div>
+        </div>
+        <div class="form-group row vertical-center">
+          <label class="col-xs-4 control-label">缴费总金额：</label>
+          <div class="col-xs-8">
+            <input class="form-control input_view" style=""
+                   v-model="selectdata.f_cumulative_payment_money"
+                   :readonly="true"/>
+          </div>
+        </div>
+        <div class="form-group row vertical-center">
+          <label class="col-xs-4 control-label">未结总金额：</label>
+          <div class="col-xs-8">
+            <input class="form-control input_view" style=""
+                   v-model="selectdata.f_surplus_money"
+                   :readonly="true"/>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click.prevent="openQrCode()">确认</button>
+      </footer>
+    </modal>
+
+    <modal v-if="showCharge" :show.sync="showQrCode" v-ref:qrcodemodal :large="true" :backdrop="false" style="height: 100%">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">微信扫码支付</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="text-center">
+          <p><b>收费金额：{{ charge.f_charge_money }}￥</b></p>
+          <p><b>收费项目：{{ charge.f_payment_term }}</b></p>
+          <div id="qrcode" class="qrcode" v-ref:qrcode></div>
+          <p>
+            等待支付，剩余&ensp;<span style="color: #ff791a">{{timeLeft}}</span>&ensp;秒
+          </p>
+        </div>
+      </article>
+      <footer slot="modal-footer"></footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {getNowDate,isEmpty} from '../../../Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+import Vue from "vue";
+
+export default {
+  title: '收费管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showCharge: false,  // 收费明细
+      showQrCode : false, // 二维码
+      model: {
+        rows: null
+      },       // 记录
+      useraddresList: [],  // 地址列表
+      charge: {
+
+      },
+      order: null,
+      timeLeft: 60,
+      paymentInterval: null,
+      orderInterval: null,
+      config: {
+
+      }
+    }
+  },
+  ready () {
+    this.search()
+    this.getConfig()
+  },
+  methods: {
+    // 新增收费
+    async saveCharge() {
+      let http = new HttpResetClass()
+      let data = {
+        apply: this.selectdata,
+        charge: this.charge,
+        user: Vue.user
+        // user: {"f_show_department_name":"","parentname":"周口运营部","functions":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"客服系统","icon":"/images/lefticon/档案管理.png","hasright":false,"resourcetype":"function","parentid":"27","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"city-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"231","name":"街道管理","templatename":"functionedit","id":"230","position":"1","fullname":"资源管理.功能模块.客服系统.档案管理.街道管理","fullid":"3.21.27.212.230","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"area-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"219","name":"小区管理","templatename":"functionedit","id":"218","position":"3","fullname":"资源管理.功能模块.客服系统.档案管理.小区管理","fullid":"3.21.27.212.218","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"address-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"33664","name":"地址管理","templatename":"functionedit","id":"33663","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.地址管理","fullid":"3.21.27.212.33663","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"file-user-files","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"237","name":"用户档案","templatename":"functionedit","id":"236","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.用户档案","fullid":"3.21.27.212.236","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"档案管理","link":"file-user-files-new","hasright":true,"resourcetype":"function","parentid":"212","f_parentname":"档案管理","children":[],"selfid":"39450","name":"预备户管理","templatename":"functionedit","id":"39449","position":"6","fullname":"资源管理.功能模块.客服系统.档案管理.预备户管理","fullid":"3.21.27.212.39449","tablename":"t_function"}],"selfid":"213","name":"档案管理","templatename":"functionedit","id":"212","position":"2","fullname":"资源管理.功能模块.客服系统.档案管理","fullid":"3.21.27.212","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"客服系统","icon":"/images/lefticon/报建系统.png","hasright":true,"resourcetype":"function","parentid":"27","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"install-function","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34680","name":"功能业务","templatename":"functionedit","id":"34679","position":"1","fullname":"资源管理.功能模块.客服系统.报建业务.功能业务","fullid":"3.21.27.34673.34679","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"exploration-user","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34686","name":"流程业务","templatename":"functionedit","id":"34685","position":"2","fullname":"资源管理.功能模块.客服系统.报建业务.流程业务","fullid":"3.21.27.34673.34685","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"supervisory-control","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34692","name":"流程监控","templatename":"functionedit","id":"34691","position":"3","fullname":"资源管理.功能模块.客服系统.报建业务.流程监控","fullid":"3.21.27.34673.34691","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"apply-charge-search","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34698","name":"收费明细","templatename":"functionedit","id":"34697","position":"4","fullname":"资源管理.功能模块.客服系统.报建业务.收费明细","fullid":"3.21.27.34673.34697","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"order-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34704","name":"预约申请","templatename":"functionedit","id":"34703","position":"5","fullname":"资源管理.功能模块.客服系统.报建业务.预约申请","fullid":"3.21.27.34673.34703","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"stop-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34710","name":"终止报建","templatename":"functionedit","id":"34709","position":"6","fullname":"资源管理.功能模块.客服系统.报建业务.终止报建","fullid":"3.21.27.34673.34709","tablename":"t_function"}],"selfid":"34674","name":"报建业务","templatename":"functionedit","id":"34673","position":"12","fullname":"资源管理.功能模块.客服系统.报建业务","fullid":"3.21.27.34673","tablename":"t_function"}],"qrcode":"/rs/user/getQRcode?QRCODE=12b2-1631604191812-03447","rolesnames":"营业厅报装,市场部报装,设计部报装,工程部报装,运营部报装,财务部报装,角色监控","f_sex":"男","roles":"51383,51485,51707,51767,51833,51905,52289","f_icon":"tree_user","fullnames":"河南亿星集团实业有限公司.周口市天然气有限公司.周口运营部.报建测试","dir":"ZhouKou","userid":"12b2-1631604191812-03447","accesstime":"1631606085945","parentid":"46569","f_show_rolestr":"","fullids":"30463.10101.46569.51953.","number":"10101","f_dep_id":"1010101203","f_idnumber":{},"selfid":"51954","templatename":"useredit","id":"51953","state":"在职","tablename":"t_user","deptype":"部门","depids":"46569","loginid":"15","imgid":{},"f_user_telephone":{},"rolestr":"营业厅报装,市场部报装,设计部报装,工程部报装,运营部报装,财务部报装,角色监控","deps":"周口运营部","f_age":{},"resourcetype":"user","orgid":"10101","f_department_name":"周口运营部","ename":"bjcs","deleted":"false","entitytype":"t_user","f_description":{},"loginip":"192.168.66.37","name":"报建测试","position":"1","orgs":"周口市天然气有限公司","haslicense":true,"f_role_name":"营业厅报装 市场部报装 设计部报装 工程部报装 运营部报装 财务部报装 角色监控 ","f_allArea":[],"f_gasman":[],"lics":[]}
+      }
+
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addApplyChargeRecord`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '缴费失败！！！'
+      })
+      this.selectdata = res.data
+
+      this.$dispatch('breakControl')
+    },
+    // 获取订单信息
+    async getOrderInformation () {
+      // 查询订单信息
+      console.log('查询订单信息！！！')
+      let data = {
+        out_trade_no: this.order.out_trade_no,
+        filiale: this.config[Vue.user.number]
+      }
+      // 查询订单状态
+      let http = new HttpResetClass()
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/weixin/queryBzIsPay`, data, {
+        resolveMsg: null,
+        rejectMsg: '订单查询失败！！！'
+      })
+
+      // 支付成功
+      if (res.data.trade_state === 'SUCCESS') {
+        clearTimeout(this.paymentInterval)
+        clearTimeout(this.orderInterval)
+        this.timeLeft = 10
+        // 清除二维码
+        this.clearQrCode()
+        this.showQrCode = false
+
+        this.saveCharge()
+      }
+    },
+    // 打开二维码
+    async openQrCode () {
+      if (isEmpty(this.charge.f_payment_term)) {
+        this.$showAlert('请选择收费项目！！！', 'warning', 3000)
+        return
+      }
+      if (isEmpty(this.charge.f_charge_money)) {
+        this.$showAlert('请输入收费金额！！！', 'warning', 3000)
+        return
+      }
+
+      let http = new HttpResetClass()
+      // 接口金额 单位为：分
+      let data = {
+        money: this.charge.f_charge_money * 100,
+        attach: {},
+        str: this.charge.f_payment_term,
+        filiale: this.config[Vue.user.number]
+      }
+      // 下订单
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/weixin/bzgetcode`, data, {
+        resolveMsg: null,
+        rejectMsg: '订单生成失败！！！'
+      })
+
+      console.log('=================================')
+      console.log(res.data)
+      this.order = res.data
+
+      this.showQrCode = true
+
+      this.$nextTick(()=>{
+        this.qrcode()
+      })
+
+      // 剩余支付时间
+      this.paymentInterval = setInterval(() => {
+        this.timeLeft = this.timeLeft - 1
+      },1000)
+
+      // 3秒查询一次订单支付信息
+      this.orderInterval = setInterval(() => {
+        this.getOrderInformation()
+      },3000)
+
+    },
+    qrcode () {
+      let qrcode = new QRCode('qrcode',{
+        text: this.order.url, // 设置二维码内容或跳转地址
+        width: 200, // 设置宽度，单位像素
+        height: 200, // 设置高度，单位像素
+        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
+      })
+    },
+    clearQrCode () {
+      document.getElementById('qrcode').innerHTML = ''
+    },
+    moneyChange () {
+      if (isEmpty(this.charge.f_charge_money) || Number(this.charge.f_charge_money) === 0) {
+        this.$showAlert('单笔收费不能为0元！！！', 'warning', 3000)
+        this.charge.f_charge_money = null
+        return
+      }
+      if (this.selectdata.f_apply_type === '散户集体报建' && Number(this.charge.f_charge_money) > Number(this.charge.f_outstanding_amount)) {
+        this.$showAlert('单笔收费不能超过未交金额！！！', 'warning', 3000)
+        this.charge.f_charge_money = null
+        return
+      }
+      if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_surplus_money)) {
+        this.$showAlert('单笔收费不能超过未交总金额！！！', 'warning', 3000)
+        this.charge.f_charge_money = null
+        return
+      }
+    },
+    // 金额转大写
+    handleInput(e) {
+      // 通过正则过滤小数点后两位
+      e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
+      this.charge.f_amount_words = this.smalltoBIG(e.target.value)
+    },
+    // 金额转大写
+    smalltoBIG(n) {
+      let fraction = ['角', '分'];
+      let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+      let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']];
+      let head = n < 0 ? '欠' : '';
+      n = Math.abs(n);
+
+      let s = '';
+
+      for (var i = 0; i < fraction.length; i++) {
+        s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+      }
+      s = s || '整';
+      n = Math.floor(n);
+
+      for (var i = 0; i < unit[0].length && n > 0; i++) {
+        let p = '';
+        for (var j = 0; j < unit[1].length && n > 0; j++) {
+          p = digit[n % 10] + unit[1][j] + p;
+          n = Math.floor(n / 10);
+        }
+        s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
+      }
+      return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+    },
+    async getUserAddress() {
+      let http = new HttpResetClass()
+      let data = {}
+      let url = null
+      if (this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建') {
+        data = {
+          condition: `ui.f_userinfo_id = ${this.selectdata.f_userinfo_id}`
+        }
+        url = `${this.$androidUtil.getProxyUrl()}/rs/sql/applyGetUserinfos`
+      } else {
+        data = {
+          condition: this.selectdata.f_apply_type === '散户集体报建' ? `nvl(cr.f_cumulative_payment_money, 0) < ${this.selectdata.f_price}` : '1=1',
+          f_process_id: this.selectdata.f_process_id
+        }
+        url = `${this.$androidUtil.getProxyUrl()}/rs/sql/getAddresAndCumulativePayment`
+      }
+      let res = await http.load('POST', url, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '用户获取失败！！！'
+      })
+
+      if (res.data.length <= 0) {
+        this.$showAlert('暂无需要缴费用户！！！', 'warning', 3000)
+      }
+
+      this.useraddresList = res.data.map(item => {
+        return {
+          // 有用户姓名地址后拼接姓名
+          label: `${item.f_address} ${isEmpty(item.f_user_name) ? '' : '--- ' + item.f_user_name}`,
+          value: item
+        }
+      })
+
+    },
+    async showChargeModal() {
+      this.getUserAddress()
+
+      this.charge.f_payment_method = '掌上营业厅'
+
+      this.showCharge = true
+    },
+    async search () {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyChargeRecord`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '收费记录查询失败！！！'
+      })
+      this.model.rows = res.data
+    },
+    // 关闭对话框
+    closeModal () {
+      this.showCharge = false
+      this.showInvalid = false
+      this.showPrint = false
+      this.charge = {}
+      this.search()
+    },
+    async getConfig () {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getWeiXinConfig`, null, {
+        resolveMsg: null,
+        rejectMsg: '获取配置失败！！！'
+      })
+
+      console.log('==============================')
+      console.log(res.data)
+
+      this.config = res.data
+
+      this.timeLeft = this.config.timeLeft
+    },
+  },
+  events: {
+  },
+  computed: {
+    paymentMethod() {
+      return this.$appdata.getParam("付款方式")
+    },
+    paymentTerm() {
+      return this.$appdata.getParam("收费项目")
+      // return [{label: '安装费', value: '安装费'}]
+    }
+  },
+  watch: {
+    timeLeft () {
+      if (this.timeLeft <= 0) {
+        clearTimeout(this.paymentInterval)
+        clearTimeout(this.orderInterval)
+
+        this.timeLeft = this.config.timeLeft
+
+        // 清除二维码
+        this.clearQrCode()
+
+        this.showQrCode = false
+
+        this.$showMessage('订单支付超时！！！')
+      }
+    }
+  }
+}
+</script>
+<style scoped lang="less">
+.qrcode {
+  display: inline-block !important;
+  margin: 10px 0px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.vertical-center {
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+/*清除model中的浮动*/
+.clearfix:after,.clearfix:before{
+  display: table;
+}
+.clearfix:after{
+  clear: both;
+}
+</style>

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

@@ -346,8 +346,11 @@ export default {
     async search () {
       let http = new HttpResetClass()
       let data = {
-        condition: " 1=1",
-        f_process_id: this.selectdata.f_process_id
+        condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`
+      }
+
+      if (this.selectdata.f_apply_type === '团购转散户') {
+        data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
       }
       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {
       // let res = await http.load('POST', `rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {

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>
@@ -54,6 +58,11 @@
                      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" 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='项目名'>
+            </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"
@@ -114,10 +123,10 @@
             <th>合同编号</th>
             <th>报建类型</th>
             <th>缴费编码</th>
-            <th>收费金额</th>
+            <th>收费金额(退款金额)</th>
             <th>付款方式</th>
-            <th>收费人员</th>
-            <th>收费日期</th>
+            <th>收费人员(退款人员)</th>
+            <th>收费日期(退款日期)</th>
             <th>状态</th>
           </tr>
         </template>
@@ -169,19 +178,17 @@ 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],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
       chargeStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'}
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
       ],
       criteriaShow: false,
       chargeAll: {
@@ -208,9 +215,13 @@ export default {
   methods: {
     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] = ''
       })
     },
+    searchCondition (args) {
+      args.condition = args.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
@@ -227,6 +238,13 @@ export default {
       let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
       this.chargeAll = res.data[0]
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
     }
   },
   computed: {

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

@@ -1,30 +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">{{$refs.query.chargeAll.count}}</span>笔，
-        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '报建收费明细',
-  data () {
-    return {
-    }
-  },
-  ready () {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<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>

package/src/components/product/Function/InstallFunction.vue

@@ -15,7 +15,7 @@
                           :isdelete="true"
                           :isusetype="true"
                           :isremark = "true"
-                          :takeimg="false"
+                          :takeimg="true"
                           :issearch="true"
                           :defname="show_data.defname"
             >