manage-client 3.2.129 → 3.2.132

package/src/components/SellReport/UserFillmoney.vue

@@ -0,0 +1,420 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <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 for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='department'
+                              @res-select="$parent.$parent.getdep"
+                              :parentresid="$parent.$parent.depresid"
+                              :initresid='$parent.$parent.depid'>
+                  </res-select>
+
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='user'
+                              is-mul="false"
+                              @res-select="$parent.$parent.getuser"
+                              :parentresid="$parent.$parent.userresid"
+                              :initresid='$parent.$parent.operatorid'>
+                  </res-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</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="userGasFillCard"
+                                template-name='营业厅明细导出'
+                                :choose-col="true"></export-excel>
+                  <print-data-self :model="$parent.model" :field="$parent.$parent.getfield"
+                                   :defaultfield="$parent.$parent.defaultfield" printName="营业厅明细"
+                                   :sumsmodel="$parent.$parent.sumsmodel" :sum-field="$parent.$parent.sumField" :page-sum="$parent.$parent.pageSum"
+                                   :start-date="$parent.$parent.startDate" :end-date="$parent.$parent.endDate"
+                  ></print-data-self>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>序号</nobr>
+                </th>
+                <th>
+                  <nobr>用户编号</nobr>
+                </th>
+                <th>
+                  <nobr>用户名称</nobr>
+                </th>
+                <th>
+                  <nobr>上期结余</nobr>
+                </th>
+                <th>
+                  <nobr>实收金额</nobr>
+                </th>
+                <th>
+                  <nobr>购气气量</nobr>
+                </th>
+                <th>
+                  <nobr>应收金额</nobr>
+                </th>
+                <th>
+                  <nobr>滞纳金</nobr>
+                </th>
+                <th>
+                  <nobr>本期结余</nobr>
+                </th>
+                <th>
+                  <nobr>差值金额</nobr>
+                </th>
+                <th>
+                  <nobr>用户类型</nobr>
+                </th>
+                <th>
+                  <nobr>收费类型</nobr>
+                </th>
+                <th>
+                  <nobr>日期</nobr>
+                </th>
+                <th>
+                  <nobr>操作员</nobr>
+                </th>
+
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_balance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_delaypay}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_curbalance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_charmoney}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_delivery_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold" >
+              报表统计时间
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-if="startDate==endDate">
+              {{startDate}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-else>
+              {{startDate+" 至 "+endDate}}
+            </td>
+          </tr>
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              差值金额:{{sumsmodel.f_charmoney.toFixed(2)}}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import defaultPrint from '../sale/config/DefaultPrint'
+import exportConfig from '../sale/config/exportConfig'
+import PrintDataSelf from '../sale/common/PrintDataSelf'
+
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  title: '收费记录不匹配查询',
+  props: ['data'],
+  data() {
+    return {
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: [],
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      data: {},
+      other:[],
+      footer:[],
+      model: new PagedList('rs/sql/userGasFillmoney', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
+
+        f_charmoney:0,
+
+      }),
+      gasproperties:[],
+      show:false,
+      rowdata:{},
+      residentialArea: [],
+      modelval: [],
+      startDate:"",
+      endDate:"",
+      inputtouPerson: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+
+      // 下拉框
+
+      //合计数据
+      sumsmodel: {},
+      sumField: {
+        'f_charmoney': '差值金额'
+      },
+      pageSum: {
+
+
+        'f_charmoney': '0.00'
+      },
+      defaultfield: [],
+      config: {
+        defaultPrint: ['f_userinfo_code', 'f_user_name']
+      },
+      batchmoneyShow:false
+    }
+  },
+  ready() {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    getotherfooter(){
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+      this.other=[];
+      this.footer=[];
+      let exportdata = this.getCondition;
+      let otherInData=[];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      let footerData=[],exportfield=this.getfield;
+      footerData.push("合计");
+      let self =this;
+      for(var field in self.sumsmodel){
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+      }
+      this.footer.push(footerData);
+      this.other.push(otherInData);
+    },
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      let orgcondition = ' s.f_orgid in (' + this.f_orgid + ')'
+      if (this.f_depid[0]) {
+        orgcondition += " and s.f_depid in("+this.f_depid.toString()+')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and s.f_operatorid in (' + this.f_operatorid + ')'
+      }
+      this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
+      this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
+      this.orgCondtionStr=orgcondition
+      this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
+      this.model.search(args.f_orgid, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      console.log('所有打印字段', this.fields)
+      this.printshow = true
+      this.put()
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>收费记录不匹配查询</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    dealmsg(val) {
+      console.log('---------------dealmsg')
+      this.rowdata=val
+      this.show=true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    close() {
+      this.printshow = false
+      this.all = false
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    userTypeChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.criteria.model !==null) {
+        this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
+        this.put()
+      }
+    },
+    'modelval.length'() {
+      this.put()
+    },
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
+      },
+      deep: true
+    }
+  },
+  computed: {
+    getCondition() {
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        f_orgid: this.orgCondtionStr
+
+      }
+
+    },
+    getfield() {
+      return exportConfig.UserGasFillCardConfig
+    },
+    whetherpaies () {
+      return [
+        {label: '全部', value: ''},
+        {label: '已缴费', value: '是'},
+        {label: '未缴费', value: '否'}
+      ]
+    },
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+
+  }
+}
+</script>

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

@@ -60,7 +60,7 @@
                 </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>
+                <res-select-group :initres="$parent.$parent.initres" :cascade =true  @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"
@@ -530,6 +530,7 @@
       this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
     }
     args.condition = `${args.condition}` + this.orgCondtionStr
+    args.condition = args.condition.replace(/f_zones/, "f_slice_area")
     await this.model.search(args.condition, args.model)
     this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
 

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

@@ -59,7 +59,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <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>
+                <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @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"

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

@@ -132,7 +132,7 @@
                             condition="f_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -388,6 +388,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },

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

@@ -106,7 +106,7 @@
                             condition="f_operat_type = '{}'"
                             close-on-select></v-select>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"  :cascade =true v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -339,6 +339,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition} ` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },

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

@@ -397,6 +397,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },

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

@@ -58,7 +58,7 @@
               </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>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true 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"
@@ -451,6 +451,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
        this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length

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

@@ -56,7 +56,7 @@
               </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>
+                <res-select-group :initres="$parent.$parent.initres" :cascade =true  @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"

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

@@ -55,7 +55,7 @@
               </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>
+                <res-select-group :initres="$parent.$parent.initres"  :cascade =true  @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"

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

@@ -53,7 +53,7 @@
                 </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>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true  v-ref:sel></res-select-group>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>

package/src/components/sale/report/aode/MonthByChargeType.vue

@@ -6,7 +6,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
             <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" :mul="false" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">时间类型</label>
                   <v-select
@@ -313,6 +313,7 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition = `${args.condition} ` + f_orgstr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(args.condition, args.model)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

package/src/components/sale/report/aode/MonthByUserType.vue

@@ -6,7 +6,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
             <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" :mul="false" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">时间类型</label>
@@ -323,6 +323,7 @@
         }
         //由于此处底层组件默认前面加了个and,所以此处前面硬补位一个1=1 等后面加condition了可以替换
         this.condition = `${args.condition} ` + f_orgstr
+        this.condition = this.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(this.condition, args.model)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

package/src/components/sale/report/aode/YearByChargeTpye.vue

@@ -6,7 +6,7 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
         <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" :mul="false" v-ref:sel></res-select-group>
+            <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true  :mul="false" v-ref:sel></res-select-group>
             <div class="col-sm-2" >
               <label for="YeadDate" class="font_normal_body">统计年份</label>
               <datepicker  placeholder="结束日期" style="width:60%"
@@ -144,6 +144,7 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition = `${args.condition} ` + f_orgstr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         console.log('计算合计。', this.sumsmodel)

package/src/components/sale/report/aode/YearByUserType.vue

@@ -6,7 +6,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
             <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" :mul="false" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :cascade =true  :mul="false" v-ref:sel></res-select-group>
                 <div class="col-sm-2" >
                   <label for="YeadDate" class="font_normal_body">统计年份</label>
                   <datepicker  placeholder="结束日期" style="width:60%"
@@ -200,6 +200,7 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition =  `${args.condition} ` + f_orgstr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(args.condition, args.model)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums