manage-client 4.0.78 → 4.0.79-jy

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://203.57.101.233:9001/'
+var bendi = 'http://121.36.106.17:8800/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://203.57.101.233:9001/'
+var wode = 'http://121.36.106.17:8800/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -30,7 +30,7 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://203.57.101.233:9001/'
+    target: 'http://121.36.106.17:8800/'
 
   },
   '/api/af-revenue/sql/compreQuery': {
@@ -40,7 +40,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:9026/'
   },
   '/api': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://121.36.106.17:8800/'
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -54,7 +54,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://121.36.106.17:8800/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -96,7 +96,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://121.36.106.17:8800/'
   },
   '/rs/file': {
     target: bendi

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.78",
+    "version": "4.0.79-jy",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/SellReport/siyang/NonResidentGas.vue

@@ -61,6 +61,21 @@
              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
              <report-excel id='gasprice'></report-excel>
           </div>
+          <div class="col-sm-2">
+            <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" >
+            <label class="font_normal_body">用气性质:</label>
+            <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                      :options='$parent.$parent.gasproperties' placeholder='请选择'
+                      condition="f_gasproperties = '{}'"
+                      close-on-select></v-select>
+          </div>
         </div>
     </criteria>
     <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
@@ -138,6 +153,7 @@
         f_operatorid: this.$login.f.id,
         operatorid: [],
         depid: [],
+        gasproperties: [],
         orgname: '',
         depname: '',
         operatorname: '',
@@ -155,6 +171,16 @@
       console.log(this.$login.f)
     },
     methods: {
+      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: ''}]
+        }
+      },
       searchData () {
         this.$refs.paged.$refs.criteria.search()
       },
@@ -203,8 +229,11 @@
       }
     },
     computed: {
-      metertype() {
+      metertype () {
         return [...this.$appdata.getParam('气表类型查询')]
+      },
+      usertypes () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       }
     }
   }

package/src/components/SellReport/siyang/SYKFSummary.vue

@@ -24,6 +24,24 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        v-model="model.f_user_type"
+                        multiple
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        condition="f_user_type in {}"
+                        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"
+                        multiple
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties in {}"
+                        close-on-select></v-select>
+            </div>
             <res-select-group :show-component="$parent.$parent.resshow"
                               :selectin="true" :initres="$parent.$parent.initres"
                               :cascade =true @re-res="$parent.$parent.getRes"
@@ -103,6 +121,7 @@ export default {
       operatorname: '',
       orgCondtionStr: '1=1',
       f_user_type: '',
+      f_gasproperties: '',
       f_state: ['有效'],
       model: new DataModel('api/af-revenue/report/sy_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
         f_orgid: 'this.model.f_orgid'}),
@@ -126,7 +145,7 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = '1=1'
+      let orgcondition = args.condition
       let orgstr = this.orgCondtionStr
       orgcondition = orgcondition + orgstr
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
@@ -165,6 +184,12 @@ export default {
     }
   },
   computed: {
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
   }
 }
 </script>

package/src/components/SellReport/siyang/SYManageBusSummary.vue

@@ -0,0 +1,239 @@
+<template>
+  <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>
+        <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" 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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </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" style="width: 60%"></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'
+                          is-mul="false"
+                          @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>
+-->
+            <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>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+            <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 class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="$parent.$parent.f_user_type"
+                        v-model="$parent.$parent.f_user_type"
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        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="$parent.$parent.f_state" multiple-->
+            <!--v-model="$parent.$parent.f_state"-->
+            <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
+            <!--condition="f_state in {}"-->
+            <!--close-on-select></v-select>-->
+            <!--</div>-->
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">收费结账报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+
+export default {
+  title: '收费结账报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      // f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('api/af-revenue/report/sy_getMoneyAll', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  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'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      console.log('23231312321:',this.f_user_type)
+      if(this.f_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      /*        if (this.f_orgid && this.f_orgid[0]) {
+                orgcondition += ` and f_orgid in ('${this.f_orgid}')`
+              }
+              if (this.f_depid && this.f_depid[0]) {
+                orgcondition += ` and f_depid in ('${this.f_depid}')`
+              }
+              if(this.f_operatorid && 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)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+      console.log(obj,"========")
+      this.operatorname = obj.operatornames[0]
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue

@@ -0,0 +1,798 @@
+<template>
+  <div id="unit" class="flex-row"  >
+    <div class="basic-main"  @keyup.enter="search" >
+      <div class="flex"  :class="{showbottom:showbottomsum}" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <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">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              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 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>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="changeMeterQuery" 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>
+                  <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" :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"
+                         condition="f_user_name like '%{}%'" 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_phone"
+                         condition="f_user_phone like '%{}%'" 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_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"
+                            v-model="model.f_user_type"
+                            :options='$parent.$parent.userTypes' placeholder='请选择'
+                            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_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            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_meter_brand_old"
+                            v-model="model.f_meter_brand_old"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand_old = '{}'"
+                            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_type"
+                            v-model="model.f_type"
+                            :options='$parent.$parent.changeTypes' placeholder='请选择'
+                            condition="f_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">换&nbsp;表&nbsp;&nbsp;人</label>
+                  <v-select :value.sync="model.f_change_operator"
+                            v-model="model.f_change_operator"
+                            :options='$parent.$parent.changePerson' placeholder='请选择'
+                            condition="f_change_operator = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">换表状态</label>
+                  <v-select :value.sync="model.f_state"
+                            v-model="model.f_state"
+                            :options='$parent.$parent.charge_state' placeholder='请选择'
+                            condition="f_state = '{}'"
+                            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_changetables_check_state"
+                            v-model="model.f_changetables_check_state"
+                            :options='$parent.$parent.changetables_check_state' placeholder='请选择'
+                            condition="f_changetables_check_state  {} "
+                            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_meter_type_old"
+                            v-model="model.f_meter_type_old"
+                            :options='$parent.$parent.meterClassify' placeholder='请选择'
+                            condition="f_meter_type_old = '{}'"
+                            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_meter_type"
+                            v-model="model.f_meter_type"
+                            :options='$parent.$parent.meterClassify' placeholder='请选择'
+                            condition="f_meter_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_changemeter_fee"
+                            v-model="model.f_changemeter_fee"
+                            :options='$parent.$parent.changemeter_fee' placeholder='请选择'
+                            condition="f_changemeter_fee {}"
+                            close-on-select></v-select>
+                </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 ='{}'"
+                            :value.sync="model.f_payment"
+                            :options='$parent.$parent.payments'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&ensp;封&ensp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
+                         condition="f_metertitles = '{}'" placeholder='表封号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">旧&emsp;表&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber_old"
+                         condition="f_meternumber_old = '{}'" placeholder='旧表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                <label class="font_normal_body">旧&emsp;卡&emsp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
+                       condition="f_card_old = '{}'" placeholder='旧卡号'>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
+            <template partial='head'>
+              <tr>
+                <th><nobr>审核状态</nobr></th>
+                <th>
+                  <!--<nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                </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>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </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>
+                  <!--                  <nobr>换表日期</nobr>-->
+                  <data-order field="f_operate_date" name="换表日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                </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>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;"><nobr>
+                <button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
+                <span v-if="row.f_changetables_check_state">{{row.f_changetables_check_state}}</span>
+              </nobr></td>
+              <td style="text-align: center;"><nobr>
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_base}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_balance_amount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.leigougas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.leigoumoney}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_changemeter_fee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_metertitles}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_remanent_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_remanent_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_serial_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_change_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;"><nobr>
+                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+              </nobr></td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_changetables_check_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_changetables_check_person}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_changetables_check_reason}}</nobr>
+              </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">
+              表上余额合计:&emsp;{{sumsmodel.f_balance_amount}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              换表费合计:&emsp;{{sumsmodel.f_changemeter_fee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              补气量合计:&emsp;{{sumsmodel.f_remanent_gas}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              补气金额合计:&emsp;{{sumsmodel.f_remanent_money}}
+            </td>
+          </tr>
+        </table>
+        <!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
+        <!--<modal :show.sync="printshow" v-ref:modal backdrop="false">-->
+        <!--<header slot="modal-header" class="modal-header text-center">-->
+        <!--<h4 class="modal-title">打印列选择</h4>-->
+        <!--<input type="checkbox" class="" id="f_generations" v-model="all">-->
+        <!--<label for="f_generations" class="font-size">全选</label>-->
+        <!--</header>-->
+        <!--<article slot="modal-body">-->
+        <!--<div class="auto col-sm-11 col-md-offset-1"  style="margin-top: 10px;">-->
+        <!--<div class="col-sm-3" v-for="f in fields">-->
+        <!--<input type="checkbox" class="" :id="'water-owe-details-'+$index" v-model="modelval" :value="$key">-->
+        <!--<label :for="'water-owe-details-'+$index" class="font-size">{{f}}</label>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</article>-->
+        <!--<footer slot="modal-footer" class="modal-footer">-->
+        <!--<center>-->
+        <!--<button v-show="printshow" type="button" class="btn btn-default" @click='close()'>取消</button>-->
+        <!--<button v-show="printshow" type="button" class="btn btn-success" @click='print()'>打印</button>-->
+        <!--<print-table :model='model' v-show="false" v-ref:print-->
+        <!--:top='40' :left='60' :right='40' :bottom='60'-->
+        <!--:thead="thead" :tfoot='tfoot' :attach="yangsen"-->
+        <!--:fields="modelval" :printpage="true">-->
+        <!--</print-table>-->
+        <!--</center>-->
+        <!--</footer>-->
+        <!--</modal>-->
+      </div>
+      <div class="flex" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div>
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <upload  :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <modal :show.sync="showCheck" v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+        <h4 class="modal-title">换表审核</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal select-overspread">
+            <div class="form-group" >
+              <label class=" col-sm-2 control-label">审核结果:</label>
+              <div class="col-sm-2">
+                <v-select v-model="check.f_changetables_check_state"
+                          placeholder='请选择'
+                          :value.sync="check.f_changetables_check_state"
+                          :options='check_state'
+                          :value-single="true"
+                          close-on-select clear-button>
+                </v-select>
+              </div>
+            </div>
+            <div class="form-group" :class="[$v.f_changetables_check_reason.required ? 'has-error' : 'has-success']">
+              <label for="f_cancel_reason" class=" col-sm-2 control-label">原因:</label>
+              <div class="col-sm-8">
+                <textarea class="form-control" v-model="check.f_changetables_check_reason" rows="3"
+                          placeholder="请填写原因" v-validate:f_changetables_check_reason='{required: true}'></textarea>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="btn btn-success" @click="confirmCheck()" :disabled="!$v.valid">确认</button>
+        <button class="btn btn-default" @click="cancelCheck()">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../DefaultPrint'
+  import exportConfig from '../exportConfig'
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    // self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    props:['data'],
+    title: '换表查询',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        check:{
+          f_chagetables_check_state:'',
+          f_changetables_check_reason:''
+        },
+        meterbrands: [],
+        pricenames: [],
+        model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
+        },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        show:false,
+        showCheck:false,
+        rowdata:{},
+        showupload:false,
+        selected:{},
+        thead: '',
+        tfoot: '',
+        defaultfield: [],
+        // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
+        //合计数据
+        sumsmodel: {},
+        changemeter_fee:[
+          {label: '全部', value: ''},
+          {label: '销售', value: '> 0'},
+          {label: '免费', value: '= 0'}
+        ]
+      }
+
+    },
+    ready() {
+      console.log(this.$login.r)
+      this.startDate=this.$parent.startDate
+      this.endDate=this.$parent.endDate
+      readySomething(this)
+    },
+    methods: {
+      checkData(obj){
+        this.rowdata=obj
+        this.showCheck=true
+      },
+      view(row){
+        this.showupload = true
+        this.selected= row
+        console.log("11",row)
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      confirmCheck(){
+        this.rowdata.f_changetables_check_person = this.$login.f.name
+        this.rowdata.f_changetables_check_reason = this.check.f_changetables_check_reason
+        this.rowdata.f_changetables_check_state = this.check.f_changetables_check_state
+        this.$resetpost('api/af-revenue/logic/changeTablesCheck',{data:this.rowdata}).then((res)=>{
+          this.showCheck = false
+          this.check={
+            f_changetables_check_reason: '',
+            f_chagetables_check_state: '',
+          }
+
+          this.search()
+        })
+      },
+      cancelCheck(){
+        this.showCheck = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      getotherfooter () {
+        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);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
+      },
+      async initParams() {
+    // 初始化气表品牌
+    let brandArr = []
+    await this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+      let temp = {}
+      temp.label = item.label
+    temp.value = item.value.f_meter_brand
+    brandArr.push(temp)
+  })
+    this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+  },
+  async selfSearch(args) {
+    if (this.data) {
+      this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+      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
+
+    // this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+
+  },
+  clear() {
+    //清空部门和人员
+    this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+    //部门和人员变为全选
+    this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+    this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+    Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+      this.$refs.paged.$refs.cri.model[key] = []
+  })
+  },
+  show() {
+    this.criteriaShow = true
+  },
+  hidden() {
+    this.criteriaShow = !this.criteriaShow
+  },
+  getRes(obj) {
+    this.orgCondtionStr = obj
+  },
+  stamp() {
+    this.all = false
+    //默认选择要打印的列
+    this.modelval = defaultPrint.config
+    this.fields = this.getfield
+    this.printshow = true
+    this.put()
+  },
+  dealmsg(val) {
+    val.model = this.model.model
+    this.$dispatch('deal-msg', val)
+  },
+  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
+  },
+  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)
+  },
+  sort (field, rule) {
+    // 将所有排序方式设为不排序，实现相互排斥
+    for (let key in this.orderFields) {
+      if (key === field) {
+        this.orderFields[key] = rule
+      } else {
+        this.orderFields[key] = 'no'
+      }
+    }
+    // 如果新规则不排序，还原为默认排序
+    if (rule === 'no') {
+      this.model.paramSource.orderitem = `'${this.orderitem}'`
+    } else {
+      this.model.paramSource.orderitem = `'${field} ${rule}'`
+    }
+
+    this.search()
+  },
+  },
+  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: {
+    permission(name) {
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      }else{
+        return  true
+      }
+    },
+    // getstart(){
+    //   return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
+    // },
+    getCondition() {
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+    },
+    getfield() {
+      return exportConfig.changemeterConfig
+    },
+    changeTypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
+    },
+    userTypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    meterClassify() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+    },
+    changePerson() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表人')]
+    },
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    changetables_check_state(){
+      return [{label: '待审核', value: 'is null'},{label: '通过', value: "='通过'"},{label: '未通过', value: "='未通过'"}]
+    },
+    check_state(){
+      return [{label: '通过', value: "通过"},{label: '未通过', value: '未通过'}]
+    },
+    payments() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+    }
+  }
+  }
+</script>
+<style scoped>
+  .showbottom{
+    height:95%
+  }
+</style>

package/src/filiale/rongcheng/sale.js

@@ -27,4 +27,8 @@ export default function () {
   Vue.component('web-handplan-query', (resolve) => {
     require(['./WebHandplanQuery'], resolve)
   })
+  // 换表查询
+  Vue.component('change-meter-query', (resolve) => {
+    require(['./businessquery/ChangeMeterQuery'], resolve)
+  })
 }

package/src/main.js

@@ -6,8 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/yangchun/sale'
-import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
+import ShanXianSaleManage from './filiale/jingyang/sale'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -50,7 +49,6 @@ saleManage()
 webmeterManage()
 ManageHome()
 newmanage()
-ShanXianwebSaleManage()
 reportManage()
 ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')

package/src/reportManage.js

@@ -862,6 +862,10 @@ export default function () {
   Vue.component('sy_non-resident-gas', (resolve) => {
     require(['./components/SellReport/siyang/NonResidentGas'], resolve)
   })
+  // 收费结账报表
+  Vue.component('sy_manage-bus-summary', (resolve) => {
+    require(['./components/SellReport/siyang/SYManageBusSummary'], resolve)
+  })
   // 用户数量统计报表
   Vue.component('manage-metertype-number', (resolve) => {
     require(['./components/SellReport/ManageMetertypeNumber'], resolve)