apply-clients 4.1.7-weinan → 4.1.8-weinan

package/package.json

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

package/src/applyAndroid.js

@@ -33,6 +33,8 @@ export default function () {
   Vue.component('back-page', (resolve) => { require(['./components/app_apply/ToolsPage'], resolve) })
   // 收费记录
   Vue.component('app-charge-management', (resolve) => { require(['./components/app_apply/AppChargeManagement'], resolve) })
+// 材料收费信息
+  Vue.component('app-materialshoufei', (resolve) => { require(['./components/app_apply/materialshoufei'], resolve) })
 
   // 业务tab(control层)页
   Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })

package/src/components/app_apply/AppChargeManagement.vue

@@ -90,6 +90,17 @@
         <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_method ? '':'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_method"
+                          :value.sync="charge.f_payment_method"
+                          :options='paymentMethod'
+                          :value-single="true"
+                          close-on-select ></input-select>
+          </div>
+        </div>
         <div v-for="(index,payment) in charge.payment_terms">
           <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
             <label class="col-xs-4 control-label">收费项目：</label>
@@ -109,7 +120,7 @@
                      v-model="payment.f_charge_money"
                      @keyup="handleInput(index)"
                      @change="moneyChange(index)"
-                     :readonly="false"/>
+                     :readonly="true"/>
             </div>
           </div>
           <div class="form-group row vertical-center">
@@ -117,12 +128,12 @@
             <div class="col-xs-8">
               <input class="form-control input_view" style=""
                      v-model="payment.f_amount_words"
-                     :value="smalltoBIG(0)"
+                     :value="smalltoBIG(payment.f_charge_money)"
                      :readonly="true"/>
             </div>
           </div>
         </div>
-        <div class="row" style="display: flex"> <button type="button" style="margin: 0 auto;" class="btn btn-primary" @click.prevent="addPaymentTerms()">增加收费项目</button> </div>
+<!--        <div class="row" style="display: flex"> <button type="button" style="margin: 0 auto;" class="btn btn-primary" @click.prevent="addPaymentTerms()">增加收费项目</button> </div>-->
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-primary" @click.prevent="openQrCode()">确认</button>
@@ -169,6 +180,7 @@ export default {
   data () {
     return {
       showCharge: false,  // 收费明细
+      showCharge1:false, // 付款方式
       showQrCode : false, // 二维码
       model: {
         rows: null
@@ -178,9 +190,9 @@ export default {
 
       },*/
       charge: {
-        payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : '手机APP'}]
+        payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : ''}]
       },
-      order: null,
+      order: {},
       timeLeft: 120,
       paymentInterval: null,
       orderInterval: null,
@@ -195,7 +207,7 @@ export default {
   },
   methods: {
     addPaymentTerms(){
-      this.charge.payment_terms.push({f_payment_term: '',f_charge_money: '',f_payment_method : '掌上营业厅'})
+      this.charge.payment_terms.push({f_payment_term: '',f_charge_money: '',f_payment_method : this.charge.f_payment_method})
     },
     // 新增收费
     async saveCharge() {
@@ -229,7 +241,7 @@ export default {
         data: {
           items: "id",
           tablename: "t_weixinreturnxml",
-          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_bill_state = 1 `,
+          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_orde_state = '已支付' `,
           orderitem: "id"
         }
       }, {
@@ -272,7 +284,7 @@ export default {
     // 打开二维码
     async openQrCode () {
       console.log(this.charge.payment_terms)
-
+      let http = new HttpResetClass()
       for(let row = 0;row<this.charge.payment_terms.length; row++){
         console.log(this.charge.payment_terms[row])
         if (isEmpty(this.charge.payment_terms[row].f_payment_term)) {
@@ -285,25 +297,51 @@ export default {
           return
         }
       }
+
+      if (this.charge.f_payment_method !== '微信支付' && this.charge.f_payment_method !== '支付宝支付' ){
+        let info = {
+          apply: this.selectdata,
+          charge: this.charge,
+          user: Vue.user,
+          f_out_trade_no:""
+        }
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
+          resolveMsg: null,
+          rejectMsg: null
+        }).then(res=>{
+          console.log(res.data)
+          if (res.data.code == '200'){
+            this.$showMessage('缴费成功！')
+            this.showCharge=false
+            return
+          }else {
+            this.$showMessage('缴费失败')
+            this.showCharge=false
+            return
+          }
+        })
+        return
+      }
       this.showCharge=false
       //this.$dispatch('changeShowfei','待付款')
       //this.saveCharge()
-      let http = new HttpResetClass()
       // 接口金额 单位为：分
       let data = {
-        money: this.accMul(this.getTotalAmount() ,100),
+        money: this.accMul(this.getTotalAmount() ,1),
         attach: {
-          "f_type": '报建收费',
+          "f_apply_num": this.selectdata.f_apply_num,
           "f_user": Vue.user.id
         },
-        str: this.getPaymentTerm(),
-        config: this.filiale,
-        f_revenue: "productV3"
+        orderType:'报装收费',
+        userfilesid:'',
+        flag: 'JsApiWeiNan',
+        openid: '',
+        filiale: 'weinanchengtou'
       }
       console.log('下单信息')
       console.log(JSON.stringify(data))
       // 下订单
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ICBCGetCode`, data, {
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/jsApiPay`, data, {
         resolveMsg: null,
         rejectMsg: '订单生成失败！！！'
       })
@@ -370,7 +408,7 @@ export default {
     },
     qrcode () {
       let qrcode = new QRCode('qrcode',{
-        text: this.order.url, // 设置二维码内容或跳转地址
+        text: this.order.appId, // 设置二维码内容或跳转地址
         width: 200, // 设置宽度，单位像素
         height: 200, // 设置高度，单位像素
         correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
@@ -458,10 +496,7 @@ export default {
         resolveMsg: null,
         rejectMsg: '用户获取失败！！！'
       })
-       console.log("服务数据",res.data)
-      if (res.data.length <= 0) {
-        this.$showMessage('暂无需要缴费用户！！！', 'warning', 3000)
-      }
+
 
       this.useraddresList = res.data.map(item => {
         return {
@@ -474,9 +509,8 @@ export default {
     },
     async showChargeModal() {
       this.getUserAddress()
-
-      this.charge.f_payment_method = '掌上营业厅'
-
+      console.log("材料费",this.selectdata.f_cost_sum)
+      this.charge.payment_terms[0].f_charge_money =  this.selectdata.f_cost_sum
       this.showCharge = true
     },
     async search () {
@@ -496,7 +530,7 @@ export default {
       this.showInvalid = false
       this.showPrint = false
       this.charge = {
-        payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : '掌上营业厅'}]
+        payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : this.charge.f_payment_method}]
       }
       this.search()
     },

package/src/components/app_apply/ApplyToDoList.vue

@@ -29,19 +29,15 @@
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户类型: {{row.f_user_type}}
                   </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户地址: {{row.f_address}}
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户电话: {{row.f_phone}}
-                    <img src="../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(row.f_phone)'>
-                  </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     流程状态: {{row.f_sub_state}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建类型: {{row.f_apply_type}}
                   </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    办理环节: {{row.defname}}
+                  </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建日期: {{row.f_apply_date}}
                   </div>

package/src/components/app_apply/PlaceControler.vue

@@ -70,9 +70,6 @@
         componentName: 'apply-user-info',
         tabs: {
           // 参数全部设置成空，在ready时，等model处理好了，再添加
-          'apply-user-info': {
-            header: '基本信息', class: 'apply-user-info-class', props: null
-          },
           'apply-info': {
             header: '流程信息', class: 'apply-info-class', props: null
           },
@@ -115,7 +112,7 @@
         }
         this.componentName = name
         console.log('name=>' + name)
-        if(name == 'apply-user-info' || name == 'apply-info'){
+        if( name == 'apply-info'){
           this.tabs[name].props = {service: this.row, shutype: 'shu'}
         }else{
           this.row.defname = this.row.defname
@@ -129,11 +126,11 @@
       },
       setProps() {
         // 给各自组件添加参数
-        this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
+        // this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
         // this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
         // this.tabs['apply-defame-work'].props = {model: this.row, shutype: 'shu'}
 
-        this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
+        // this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
       },
     },
     ready () {
@@ -151,7 +148,7 @@
     },
     components: {
       'apply-info': ApplyInfo,
-      'apply-user-info':ApplyUserInfo,
+      // 'apply-user-info':ApplyUserInfo,
       // 'fieldexploration': FieldExploration,
       // 'acceptance': Acceptance,
       // 'ventilation':Ventilation

package/src/components/app_apply/ServiceControl.vue

@@ -108,7 +108,7 @@
             this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
           }
           // 如果配置类型为select,优先从参数列表获取options
-          if (this.data.fields[i].type === 'select' || this.data.fields[i].type === 'checkbox') {
+          if (this.data.fields[i].type === 'select') {
             if (this.data.fields[i].param) {
               let temp = this.$appdata.getParam(this.data.fields[i].label)
 
@@ -123,10 +123,7 @@
                 }
               }
             }
-            console.log("item.ready"+this.data.fields[i].ready)
-            if (this.data.fields[i].ready) {
-              this.data.fields[i].options = await this[this.data.fields[i].ready]()
-            }
+
           }
         }
         // 初始化 buttons_fields

package/src/components/app_apply/ServiceView.vue

@@ -24,10 +24,11 @@
               </div>
             </div>
             <!--时间datepicker-->
-            <div v-if="item.type==='datepicker'" :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-xs-12 form-group']">
-              <label  style="margin-top: 0.7em"  :class="item.label_bootstraped?item.label_bootstraped + '':'col-xs-12'">{{item.label}}：</label>
-              <div  :class="item.value_bootstraped?item.value_bootstraped:'col-xs-12'">
+            <div v-if="item.type==='datepicker'" :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+              <label  style="margin-top: 0.7em"  :class="item.label_bootstraped?item.label_bootstraped + 'control-label':'control-label col-sm-6'">{{item.label}}：</label>
+              <div  :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
                 <datepicker
+                  class="form-control"
                   :placeholder="item.placeholder"
                   :value.sync="data.fields[index].value"
                   :format="'yyyy-MM-dd HH:mm:ss'"
@@ -211,6 +212,7 @@
       // 初始化数据
       initializtion(){
         console.log('进入serviceview的initializtion方法')
+        console.log('数据aaaa',this.data)
         // let temp = this.data
         // let temp = JSON.parse(JSON.stringify(this.data))
         // this.data = temp
@@ -226,12 +228,12 @@
         if(this.data.filiale){
           this.model.f_filiale = this.data.filiale
         }else{
-          this.model.f_filiale = Vue.user.f_parentname
+          this.model.f_filiale = Vue.user.orgs
         }
         if(this.data.f_parentname){
           this.model.f_parentname = this.data.f_parentname
         }else{
-          this.model.f_parentname = Vue.user.f_parentname
+          this.model.f_parentname = Vue.user.f_department_name
         }
         if(this.data.operate_date){
           this.model.f_operate_date = this.data.operate_date

package/src/components/app_apply/materialshoufei.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid  :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th>序号</th>
+          <th>材料名称</th>
+          <th>单价(元)</th>
+          <th>数量</th>
+          <th>金额</th>
+          <th>备注</th>
+          <th v-if="$parent.$parent.mark === 0">
+            <button type="button" class="btn btn-info head-but" @click="$parent.$parent.addshoufei()" >新增收费
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td style="text-align: center">{{ $index + 1}}</td>
+        <td style="text-align: center">{{ row.f_material_name}}</td>
+        <td style="text-align: center">{{ row.f_material_price}}</td>
+        <td style="text-align: center">{{ row.f_material_number}}</td>
+        <td style="text-align: center">{{ row.f_fee}}</td>
+        <td style="text-align: center">{{ row.f_remarks}}</td>
+        <td class="flex-around" v-if="$parent.$parent.mark === 0">
+          <button type="button" name="button" class="btn btn-link"
+                  @click.stop="$parent.$parent.modifyParam(row)">修改
+          </button>
+          <button type="button" name="button" class="btn btn-link"
+                  @click.stop="$parent.$parent.deleteItem(row)">删除
+          </button>
+        </td>
+      </template>
+    </data-grid>
+    <span>合计：{{ f_cost_sum }}元</span>
+  </div>
+
+  <modal :show.sync="showpay" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="close"><span>&times;</span></button>
+      <h4 class="modal-title">新增材料收费</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <label>材料名称</label>
+        <input type="text" class="form-control" v-model="addItem.f_material_name">
+      </div>
+      <div class="from-group">
+        <label>单价(元)</label>
+        <input type="number" class="form-control" v-model="addItem.f_material_price">
+      </div>
+      <div class="from-group">
+        <label>数量</label>
+        <input type="number" class="form-control" v-model="addItem.f_material_number">
+      </div>
+      <div class="from-group">
+        <label>金额</label>
+        <input type="number" class="form-control" v-model="addItem.f_fee" :value="smalltoBIG()" readonly>
+      </div>
+      <div class="from-group">
+        <label>备注</label>
+        <textarea type="text" rows="2" class="form-control" v-model="addItem.f_remarks"></textarea>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="showpay" type="button" class="btn btn-default" @click='close'>取消</button>
+      <button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+import $ from 'jquery'
+
+export default {
+  title: '材料收费',
+  data() {
+    return {
+      showpay: false, // 新增材料收费开关
+      model: {
+        rows: [] // 材料收费数据数组
+      },
+      addItem: {},
+      f_cost_sum: 0,
+    }
+  },
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  ready() {
+    this.load()
+  },
+  methods: {
+    async load() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_material_charges',
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {resolveMsg: null, rejectMsg: '获取数据失败'})
+        .then((res) => {
+          this.model.rows = res.data
+          this.f_cost_sum = 0
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.f_cost_sum += Number(this.model.rows[i].f_fee)
+          }
+          this.$set('selectdata.f_cost_sum',this.f_cost_sum)
+        })
+    },
+    // 关闭模态框
+    close() {
+      this.showpay = false
+      this.addItem = null
+    },
+    // 模态框确定按钮保存数据
+    async addpaydipetail() {
+      let http = new HttpResetClass()
+      this.addItem.f_process_id = this.selectdata.f_process_id
+      this.addItem.f_apply_num = this.selectdata.f_apply_num
+      this.addItem.f_operator = Vue.user.name
+      this.addItem.f_department = Vue.user.f_department_name
+      this.addItem.f_filiale = Vue.user.orgs
+      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addmaterialshoufei`, this.addItem, {resolveMsg: '保存成功', rejectMsg: '保存失败'})
+        .then((res) => {
+          this.close()
+          this.load()
+        })
+    },
+    deleteItem(row) {
+      let http = new HttpResetClass()
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/delectmaterialshoufei`, {data: row}, {resolveMsg: null, rejectMsg: '删除失败'})
+        .then((res) => {
+          this.load()
+        })
+    },
+    //新增收费 开启模态框
+    addshoufei() {
+      this.showpay = true
+    },
+    modifyParam(row) {
+      this.addItem = row
+      this.showpay = true
+    },
+    // 金额计算
+    smalltoBIG() {
+      let num =  Number(this.addItem.f_material_price) *  Number(this.addItem.f_material_number)
+      return num
+    }
+  },
+  watch: {}
+}
+
+</script>
+
+
+<style scoped>
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 100%;
+}
+
+table, td, th {
+  padding: 0;
+  border: 1px solid black
+}
+
+tr {
+  height: 34px;
+}
+
+#DynamicForm input {
+  text-align: center;
+}
+
+</style>

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

@@ -1,251 +1,251 @@
-<template>
-    <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' 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='项目名'>
-            </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 HH:mm:ss'"
-                          :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 HH:mm:ss'"
-                          :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"
-                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"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_charge_collectors 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_charge_status"
-                placeholder='请选择'
-                condition="cr.f_charge_status = '{}'"
-                :value.sync="model.f_charge_status"
-                :options='$parent.$parent.chargingStatus'
-                class="select select_list"
-                :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>序号</th>
-            <th>报建编号</th>
-            <th>项目名称</th>
-            <th>合同编号</th>
-            <th>报建类型</th>
-            <th>缴费编码</th>
-            <th>收费金额</th>
-            <th>付款方式</th>
-            <th>收费人员</th>
-            <th>收费日期</th>
-            <th>状态</th>
-            <th>地址</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_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_charge_number}}</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_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_charge_status}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_address}}</font></nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '报建收费列表',
-  data () {
-    return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }, {
-        f_charge_money: 0
-      }),
-      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
-      chargingStatus: [
-        {label: '全部', value: ''},
-        {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'}
-      ],
-      criteriaShow: false,
-      chargeAll: {
-        count: 0,
-        sum: 0
-      },
-      getfield: {
-        'f_apply_num': '报建编号',
-        'f_entry_name': '项目名称',
-        'f_contract_number': '合同编号',
-        'f_apply_type': '报建类型',
-        'f_charge_money': '收费金额',
-        'f_payment_method': '付款方式',
-        'f_charge_collectors': '收费人员',
-        'f_charge_date': '收费日期',
-        'f_charge_status': '状态',
-        'f_address': '地址'
-      }
-    }
-  },
-  ready () {
-    // 调用查询
-    this.search()
-  },
-  methods: {
-    clear () {
-      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = []
-      })
-    },
-    // 查询
-    search () {
-      this.$refs.cp.$refs.cri.search()
-      this.getChargeAll()
-    },
-    async getChargeAll () {
-      let http = new HttpResetClass()
-      let data = {
-        condition: this.model.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }
-      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
-
-      this.chargeAll = res.data[0]
-    }
-  },
-  computed: {
-    getCondition () {
-      return {
-        condition: this.$refs.cp.$refs.cri.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<template>
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' 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='项目名'>
+            </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 HH:mm:ss'"
+                          :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 HH:mm:ss'"
+                          :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"
+                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"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="cr.f_charge_collectors 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_charge_status"
+                placeholder='请选择'
+                condition="cr.f_charge_status = '{}'"
+                :value.sync="model.f_charge_status"
+                :options='$parent.$parent.chargingStatus'
+                class="select select_list"
+                :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>序号</th>
+            <th>报建编号</th>
+            <th>项目名称</th>
+            <th>合同编号</th>
+            <th>报建类型</th>
+            <th>缴费编码</th>
+            <th>收费金额</th>
+            <th>付款方式</th>
+            <th>收费人员</th>
+            <th>收费日期</th>
+            <th>状态</th>
+            <th>地址</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_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_charge_number}}</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_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_charge_status}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报建收费列表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getApplyCharge', 30, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }, {
+        f_charge_money: 0
+      }),
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      chargingStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'}
+      ],
+      criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '报建编号',
+        'f_entry_name': '项目名称',
+        'f_contract_number': '合同编号',
+        'f_apply_type': '报建类型',
+        'f_charge_money': '收费金额',
+        'f_payment_method': '付款方式',
+        'f_charge_collectors': '收费人员',
+        'f_charge_date': '收费日期',
+        'f_charge_status': '状态',
+        'f_address': '地址'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = []
+      })
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+      this.getChargeAll()
+    },
+    async getChargeAll () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: this.model.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
+
+      this.chargeAll = res.data[0]
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>