manage-client 3.2.83-2 → 3.2.83-jb

package/src/components/SellReport/SellBySelfHelp.vue

@@ -2,7 +2,7 @@
   <div class="basic-main"  style="height: 100%">
   <criteria-paged :model="model" :pager='false' v-ref:paged>
     <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <p class="bg-info text-center" style="padding: 8px;">自助结账报表</p>
+        <p class="bg-info text-center" style="padding: 8px;">title</p>
       <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
         <div class="row">
@@ -26,6 +26,14 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body" title="参数:自助付款方式查询">付款方式</label>
+            <v-select :value.sync="model.f_payment" multiple
+                      v-model="model.f_payment"
+                      :options='$parent.$parent.payment' placeholder='请选择'
+                      condition="f_payment in {}"
+                      close-on-select></v-select>
+          </div>
             <div class="col-sm-4">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
               <right-tree @re-res="$parent.$parent.getRes"></right-tree>
@@ -60,7 +68,7 @@
         <thead>
         <tr>
           <th colspan='17' style="font-weight: normal; text-align: left;">
-            <h3 style="text-align: center">自助结账报表</h3>
+            <h3 style="text-align: center">{{$parent.title}}</h3>
           </th>
         </tr>
         <tr>
@@ -135,6 +143,7 @@
         printTime: this.$login.toStandardTimeString(),
         depresid: [],
         userresid: [],
+        title:"自助结账报表",
         f_orgid: this.$login.f.orgid,
         f_depid: this.$login.f.depids,
         f_operatorid: this.$login.f.id,
@@ -168,7 +177,7 @@
     ready () {
       this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-      this.$refs.paged.$refs.criteria.search()
+      // this.$refs.paged.$refs.criteria.search()
       console.log(this.$login.f)
     },
 
@@ -178,6 +187,20 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
+        console.log(this.$refs.paged.$refs.criteria.model.f_payment)
+        const payment = this.$refs.paged.$refs.criteria.model.f_payment;
+        if (payment.length === 1) {
+          const map = {
+            '农行聚合支付': '农行自助结账报表',
+            'pos聚合支付': '建行自助结账报表',
+            '农行掌银': '农行掌银自助结账报表'
+          };
+          this.title = map[payment[0]] || '自助结账报表'
+        }else{
+          this.title = '自助结账报表'
+        }
+        // if(this.$refs.paged.$refs.criteria.model.f_payment)
+
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1 = 1'
         if (this.f_orgid[0]){
@@ -250,6 +273,9 @@
       }
     },
     computed: {
+      payment () {
+        return [...this.$appdata.getParam('自助付款方式查询')]
+      },
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       }

package/src/components/SellReport/SellDepReport.vue

@@ -6,42 +6,54 @@
         <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
           <div class="row">
-            <div class="col-sm-2" >
+            <div class="col-sm-4" >
               <label class="font_normal_body" for="startDate">开始日期:</label>
               <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          :show-reset-button="reset"
-                          :disabled="$parent.$parent.noshow">
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2" >
+            <div class="col-sm-4" >
               <label  class="font_normal_body" for="endDate">结束日期:</label>
               <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 23:59:59'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body" title="参数:付款方式查询">付款方式:</label>
-              <v-select :value.sync="model.f_payment" multiple
-                        v-model="model.f_payment"
-                        :options='$parent.$parent.payment' placeholder='请选择'
-                        condition="f_payment in {}"
-                        close-on-select></v-select>
+            <div class="col-sm-4 form-group" >
+              <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+              <res-select id="dep" restype='department' style="width: 60%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid' >
+              </res-select>
+
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+              <res-select id="oper" restype='user' style="width: 60%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
             </div>
-            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
           </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
             <tie-an-account v-if="this.$login.r.includes('报表扎帐')"
                             :org="$parent.$parent.org"
-                            @update="$parent.$parent.update"
                             :model="$parent.$parent.data"
                             :fee-str="$parent.model.data"
                             :end-date="model.endDate" ></tie-an-account>
@@ -149,7 +161,6 @@
           f_operator: ''
         },
         tablen:0,
-        noshow: false,
         datas: '',
         orgname: '',
         depname: '',
@@ -158,19 +169,12 @@
         model: new DataModel('rs/report/sellDepReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
-        resshow:['company','department','operator'],
         show: false,
-        spans: 0,
-        initres: {
-          org: [this.$login.f.orgid],
-          dep: [],
-          user: []
-        }
       }
     },
     ready () {
-      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
-      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardTimeString()
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
       console.log(this.$login.f)
     },
     methods: {
@@ -178,34 +182,30 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
+
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
-        let orgstr = this.orgCondtionStr
-        this.org.f_depname = this.depname
-        this.org.f_operator = this.operatorname
-        orgcondition = orgcondition + orgstr
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + this.$refs.paged.$refs.criteria.condition
-        this.$refs.paged.search(args)
-      },
-      update (val) {
-        if (val !== ''){
-          this.$refs.paged.$refs.criteria.model.startDate = val
-          this.noshow = true
-        } else {
-          this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-          this.noshow = false
+        if (this.f_orgid[0]) {
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+        }
+        if (this.f_depid[0]) {
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
+        if(this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
       },
-      getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        this.org.f_orgname = obj.orgnames[0]
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
-        this.operatorname = obj.operatornames[0]
+      getRes (obj) {
+        this.org.f_orgname = this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.userresid = obj.resids
+        this.f_orgid = obj.resids
       },
       getdep (obj, val) {
         this.org.f_depname = this.depname = val[0]
-        this.userresid = obj
+        // this.userresid = obj
         this.f_depid = obj
       },
       getuser ( obj, val) {
@@ -256,9 +256,6 @@
       }
     },
     computed: {
-      payment() {
-        return [...this.$appdata.getParam('付款方式查询')]
-      }
     }
   }
 </script>

package/src/components/sale/businessquery/AreaChargeQuery.vue

@@ -26,28 +26,6 @@
                   >
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <v-select :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            enter-push
-                            multiple
-                            condition="f_residential_area in {}"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            close-on-select>
-
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户类型</label>
-                  <v-select :value.sync="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange()"
-                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                            condition="f_user_type = '{}'"
-                            close-on-select></v-select>
-                </div>
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -74,6 +52,28 @@
                 <res-select-group :initres="$parent.$parent.initres"
                                   :showComponent="['company','department','operator']"
                                   @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            enter-push
+                            multiple
+                            condition="f_residential_area in {}"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"

package/src/components/sale/businessquery/AreaGeneralQuery.vue

@@ -6,6 +6,44 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <!--<div class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">客户编号</label>-->
+                  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"-->
+                         <!--condition="f_userinfo_code = '{}' " placeholder="客户编号">-->
+                <!--</div>-->
+                <!--<div class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">客户名称</label>-->
+                  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"-->
+                         <!--condition="f_user_name like '%{}%'" placeholder="客户名称">-->
+                <!--</div>-->
+
+                <div class="span" style="float:right;">
+                  <!--<read-idcard></read-idcard>-->
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="areaGeneralQuery"
+                                template-name='小区综合查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="小区综合查询导出"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+
+                  <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
+                              <!--:defaultfield="$parent.$parent.defaultfield" print-name="收费查询"-->
+                              <!--:sumsmodel="$parent.$parent.sumsmodel"></print-data>-->
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -45,41 +83,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                          condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
-                <!--<div class="col-sm-2 form-group">-->
-                  <!--<label class="font_normal_body">客户编号</label>-->
-                  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"-->
-                         <!--condition="f_userinfo_code = '{}' " placeholder="客户编号">-->
-                <!--</div>-->
-                <!--<div class="col-sm-2 form-group">-->
-                  <!--<label class="font_normal_body">客户名称</label>-->
-                  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"-->
-                         <!--condition="f_user_name like '%{}%'" placeholder="客户名称">-->
-                <!--</div>-->
-
-                <div class="span" style="float:right;">
-                  <!--<read-idcard></read-idcard>-->
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="areaGeneralQuery"
-                                template-name='小区综合查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :defaultfield="$parent.$parent.defaultfield"
-                              titletable="小区综合查询导出"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
-                              <!--:defaultfield="$parent.$parent.defaultfield" print-name="收费查询"-->
-                              <!--:sumsmodel="$parent.$parent.sumsmodel"></print-data>-->
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <!--<div class="col-sm-2 form-group">-->
                   <!--<label class="font_normal_body">客户电话</label>-->
                   <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"-->
@@ -95,6 +98,8 @@
                   <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
                          <!--condition="f_address like '%{}%'" placeholder='客户地址'>-->
                 <!--</div>-->
+
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"

package/src/components/sale/businessquery/BalanceTable.vue

@@ -7,6 +7,30 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+
+
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="BalanceTable"
+                                template-name='可用余额查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="余额查询打印"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -14,7 +38,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                  >
+                              >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,7 +48,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                  >
+                             >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -32,39 +56,17 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="u.f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="旧客户编号">档案编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                          condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
 
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="BalanceTable"
-                                template-name='可用余额查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="余额查询打印"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="u.f_user_name like '%{}%'" placeholder="客户名称">
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"

package/src/components/sale/businessquery/BusinesQuery.vue

@@ -3,10 +3,21 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged >
+        <criteria-paged :model="model" v-ref:paged>
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">公&emsp;&emsp;司</label>
+                  <right-tree @re-res="getorg"
+                              :initresid='initres.org'></right-tree>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="用户编号">
+                </div>
+
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -27,23 +38,7 @@
                               condition="f_operate_date <= '{}'">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用户编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="用户编号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">付款方式</label>
-                  <v-select id="f_payment"
-                            v-model="model.f_payment"
-                            placeholder='请选择'
-                            condition="f_payment in {}"
-                            multiple="true"
-                            :value.sync="model.f_payment"
-                            :options='$parent.$parent.payments'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
+
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -57,17 +52,16 @@
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                                :defaultfield="$parent.$parent.defaultfield" titletable="业务记录"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
                 </div>
               </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                          condition=" f_user_name like '%{}%'" placeholder='用户名称'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;操作人</label>
+                  <label class="font_normal_body">操作人</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_operator"
                          condition=" f_operator like '%{}%'" placeholder='操作人'>
                 </div>
@@ -86,12 +80,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                          condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
-                <!--<div class="col-sm-2 form-group">-->
-                  <!--<label class="font_normal_body">公&emsp;&emsp;司</label>-->
-                  <!--<right-tree @re-res="getorg"-->
-                              <!--:initresid='initres.org'></right-tree>-->
-                <!--</div>-->
-                <res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes"  v-ref:sel></res-select-group>
               </div>
 
             </div>
@@ -124,15 +112,9 @@
                 <th>
                   <nobr>操作日期</nobr>
                 </th>
-                <th>
-                  <nobr>付款方式</nobr>
-                </th>
                 <th>
                   <nobr>组织名称</nobr>
                 </th>
-                <th>
-                  <nobr>支付渠道</nobr>
-                </th>
                 <th>
                   <nobr>部门名称</nobr>
                 </th>
@@ -167,15 +149,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_payment}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bank_type}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>
               </td>
@@ -254,9 +230,8 @@
         tfoot: '',
         orgrestype:'organization',
         defaultfield: [],
-        resshow:['company'],
         initres: {
-          org:[this.$login.f.orgid]
+          org:[this.$login.f.orgid],
         },
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee',  'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
@@ -312,19 +287,8 @@
           this.$refs.paged.$refs.cri.model[key] = []
         })
       },
-      // getRes(obj) {
-      //   this.orgCondtionStr = obj
-      // },
-      show() {
-        this.criteriaShow = true
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      getRes(condition,obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
+      getRes(obj) {
+        this.orgCondtionStr = obj
       },
       stamp() {
         this.all = false
@@ -397,9 +361,6 @@
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
-      payments() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
-      },
       getfield() {
         return exportConfig.businesConfig
       }