manage-client 3.2.200 → 3.2.201

package/src/filiale/WEINAN/BusinessManage.vue

@@ -1,160 +1,163 @@
-<template>
-  <!--  <div v-if="listpage">-->
-  <tab-button v-ref:list :active="-1">
-    <tabs header="收费查询" v-if="permission('收费查询')">
-      <charge-query v-if="show.includes('收费查询')" @deal-msg="dealMsg" :data="data"></charge-query>
-    </tabs>
-    <tabs header="换表查询" v-if="permission('换表查询')">
-      <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
-    </tabs>
-    <!--<tabs header="机表抄表查询" v-if="permission('机表抄表查询')">-->
-    <tabs header="机表抄表查询" v-if="false">
-      <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
-    </tabs>
-    <tabs header="过户查询" v-if="permission('过户查询')">
-      <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
-    </tabs>
-    <tabs header="其他收费查询" v-if="permission('其他收费查询')">
-      <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
-    </tabs>
-    <tabs header="冲正查询" v-if="permission('冲正查询')">
-      <reverse-query v-if="show.includes('冲正查询')" @deal-msg="dealMsg" :data="data"></reverse-query>
-    </tabs>
-    <tabs header="补卡查询" v-if="permission('补卡查询')">
-      <fill-card-query v-if="show.includes('补卡查询')" @deal-msg="dealMsg" :data="data"></fill-card-query>
-    </tabs>
-    <tabs header="补气查询" v-if="permission('补气查询')">
-      <fill-gas-query v-if="show.includes('补气查询')" @deal-msg="dealMsg" :data="data"></fill-gas-query>
-    </tabs>
-    <tabs header="启用查询" v-if="permission('启用查询')">
-      <enable-query v-if="show.includes('启用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></enable-query>
-    </tabs>
-    <tabs header="停用查询" v-if="permission('停用查询')">
-      <disable-query v-if="show.includes('停用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></disable-query>
-    </tabs>
-    <tabs header="销户查询" v-if="permission('销户查询')">
-      <cancellation-query v-if="show.includes('销户查询')" @deal-msg="dealMsg" :data="data"></cancellation-query>
-    </tabs>
-<!--    <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">-->
-<!--      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>-->
-<!--    </tabs>-->
-    <!--<tabs header="调价补差查询" v-if="permission('调价补差查询')">-->
-    <tabs header="调价补差查询" v-if="false">
-      <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
-    </tabs>
-    <tabs header="迁表查询" v-if="permission('迁表查询')">
-      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
-    </tabs>
-<!--    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">-->
-<!--      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>-->
-<!--    </tabs>-->
-<!--    <tabs header="收据查询" v-if="permission('收据查询')">-->
-<!--        <meter-receipt-query v-if="show.includes('收据查询')" @deal-msg="dealMsg" :data="data"></meter-receipt-query>-->
-<!--    </tabs>-->
-    <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
-    <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
-    <!--      </tabs>-->
-    <!--<tabs header="业务查询" v-if="permission('业务查询')">-->
-    <tabs header="业务查询" v-if="false">
-      <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
-    </tabs>
-    <!--<tabs header="预存查询" v-if="permission('预存查询')">-->
-    <tabs header="预存查询" v-if="false">
-      <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
-    </tabs>
-    <!--<tabs header="发折查询" v-if="permission('发折查询')">-->
-    <tabs header="发折查询" v-if="false">
-      <sendbook-query v-if="show.includes('发折查询')" @deal-msg="dealMsg" :data="data"></sendbook-query>
-    </tabs>
-    <tabs header="用户参保查询" v-if="permission('用户参保查询')">
-      <user-insured v-if="show.includes('用户参保查询')" @deal-msg="dealMsg" :data="data"></user-insured>
-    </tabs>
-    <tabs header="开户查询" v-if="permission('开户查询')">
-      <new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>
-    </tabs>
-    <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
-    <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
-    <!--      </tabs>-->
-  </tab-button>
-  <!--  </div>-->
-  <!--  <div v-if="!listpage">-->
-  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
-  <!--  </div>-->
-</template>
-
-<script>
-import TabButton from '../../components/sale/common/TabButton'
-import Tabs from '../../components/sale/common/Tabs'
-import ChargeQuery from './ChargeQuery'
-import { HttpResetClass } from 'vue-client'
-
-export default {
-  name: "BusinessQuery",
-  title: '业务查询',
-  data() {
-    return {// 页面开关
-      residentialArea: [],
-      f_start_date: '',
-      f_end_date: '',
-      listpage: true,
-      width: {
-        left: '100%',
-        right: '0%'
-      },
-      // searchNumber:'',
-      rowData: {},
-      show: [],
-      data: {
-        startDate: this.$login.toStandardDateString() + ' 00:00:00',
-        endDate: this.$login.toStandardDateString() + ' 23:59:59',
-        f_userinfo_code:''
-      }
-
-    }
-  },
-  components: {Tabs, TabButton, ChargeQuery},
-  ready() {
-    this.getaddress()
-    console.log(this.$refs.list)
-    console.log('业务查询')
-  },
-  methods: {
-    async  getaddress(){
-      let HttpReset = new HttpResetClass()
-      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
-        data: {
-          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
-        }
-      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
-      console.log('小区',data)
-      let house = []
-      for (let row of data.data){
-        house.push({label: row.f_residential_area, value: row.f_residential_area})
-      }
-      house.unshift({label: '全部', value: ''})
-      this.residentialArea = house
-    },
-    permission(name) {
-      if (this.$login.r.find(value => value == '综合查询')) {
-        if (!this.$login.r.find(value => value == name)) {
-          return false
-        }
-      }
-      return true
-    },
-    cancel(obj) {
-      this.listpage = true
-    },
-    dealMsg(obj) {
-      this.rowData = obj
-      this.listpage = false
-      this.f_start_date = obj.model.startDate
-      this.f_end_date = obj.model.endDate
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <!--  <div v-if="listpage">-->
+  <tab-button v-ref:list :active="-1">
+    <tabs header="收费查询" v-if="permission('收费查询')">
+      <charge-query v-if="show.includes('收费查询')" @deal-msg="dealMsg" :data="data"></charge-query>
+    </tabs>
+    <tabs header="换表查询" v-if="permission('换表查询')">
+      <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
+    </tabs>
+    <!--<tabs header="机表抄表查询" v-if="permission('机表抄表查询')">-->
+    <tabs header="机表抄表查询" v-if="false">
+      <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
+    </tabs>
+    <tabs header="过户查询" v-if="permission('过户查询')">
+      <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
+    </tabs>
+    <tabs header="其他收费查询" v-if="permission('其他收费查询')">
+      <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
+    </tabs>
+    <tabs header="冲正查询" v-if="permission('冲正查询')">
+      <reverse-query v-if="show.includes('冲正查询')" @deal-msg="dealMsg" :data="data"></reverse-query>
+    </tabs>
+    <tabs header="补卡查询" v-if="permission('补卡查询')">
+      <fill-card-query v-if="show.includes('补卡查询')" @deal-msg="dealMsg" :data="data"></fill-card-query>
+    </tabs>
+    <tabs header="补气查询" v-if="permission('补气查询')">
+      <fill-gas-query v-if="show.includes('补气查询')" @deal-msg="dealMsg" :data="data"></fill-gas-query>
+    </tabs>
+    <tabs header="启用查询" v-if="permission('启用查询')">
+      <enable-query v-if="show.includes('启用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></enable-query>
+    </tabs>
+    <tabs header="停用查询" v-if="permission('停用查询')">
+      <disable-query v-if="show.includes('停用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></disable-query>
+    </tabs>
+    <tabs header="销户查询" v-if="permission('销户查询')">
+      <cancellation-query v-if="show.includes('销户查询')" @deal-msg="dealMsg" :data="data"></cancellation-query>
+    </tabs>
+<!--    <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">-->
+<!--      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>-->
+<!--    </tabs>-->
+    <!--<tabs header="调价补差查询" v-if="permission('调价补差查询')">-->
+    <tabs header="调价补差查询" v-if="false">
+      <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
+    </tabs>
+    <tabs header="迁表查询" v-if="permission('迁表查询')">
+      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
+    </tabs>
+<!--    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">-->
+<!--      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>-->
+<!--    </tabs>-->
+<!--    <tabs header="收据查询" v-if="permission('收据查询')">-->
+<!--        <meter-receipt-query v-if="show.includes('收据查询')" @deal-msg="dealMsg" :data="data"></meter-receipt-query>-->
+<!--    </tabs>-->
+    <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
+    <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
+    <!--      </tabs>-->
+    <!--<tabs header="业务查询" v-if="permission('业务查询')">-->
+    <tabs header="业务查询" v-if="false">
+      <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
+    </tabs>
+    <!--<tabs header="预存查询" v-if="permission('预存查询')">-->
+    <tabs header="预存查询" v-if="false">
+      <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
+    </tabs>
+    <!--<tabs header="发折查询" v-if="permission('发折查询')">-->
+    <tabs header="发折查询" v-if="false">
+      <sendbook-query v-if="show.includes('发折查询')" @deal-msg="dealMsg" :data="data"></sendbook-query>
+    </tabs>
+    <tabs header="用户参保查询" v-if="permission('用户参保查询')">
+      <user-insured v-if="show.includes('用户参保查询')" @deal-msg="dealMsg" :data="data"></user-insured>
+    </tabs>
+    <tabs header="开户查询" v-if="permission('开户查询')">
+      <new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>
+    </tabs>
+    <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
+    <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
+    <!--      </tabs>-->
+    <tabs header="档案合并查询" v-if="permission('档案合并查询')">
+      <merge-file-query v-if="show.includes('档案合并查询')"></merge-file-query>
+    </tabs>
+  </tab-button>
+  <!--  </div>-->
+  <!--  <div v-if="!listpage">-->
+  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+  <!--  </div>-->
+</template>
+
+<script>
+import TabButton from '../../components/sale/common/TabButton'
+import Tabs from '../../components/sale/common/Tabs'
+import ChargeQuery from './ChargeQuery'
+import { HttpResetClass } from 'vue-client'
+
+export default {
+  name: "BusinessQuery",
+  title: '业务查询',
+  data() {
+    return {// 页面开关
+      residentialArea: [],
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [],
+      data: {
+        startDate: this.$login.toStandardDateString() + ' 00:00:00',
+        endDate: this.$login.toStandardDateString() + ' 23:59:59',
+        f_userinfo_code:''
+      }
+
+    }
+  },
+  components: {Tabs, TabButton, ChargeQuery},
+  ready() {
+    this.getaddress()
+    console.log(this.$refs.list)
+    console.log('业务查询')
+  },
+  methods: {
+    async  getaddress(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+        data: {
+          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      console.log('小区',data)
+      let house = []
+      for (let row of data.data){
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      house.unshift({label: '全部', value: ''})
+      this.residentialArea = house
+    },
+    permission(name) {
+      if (this.$login.r.find(value => value == '综合查询')) {
+        if (!this.$login.r.find(value => value == name)) {
+          return false
+        }
+      }
+      return true
+    },
+    cancel(obj) {
+      this.listpage = true
+    },
+    dealMsg(obj) {
+      this.rowData = obj
+      this.listpage = false
+      this.f_start_date = obj.model.startDate
+      this.f_end_date = obj.model.endDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/WEINAN/MergeFileQuery.vue

@@ -0,0 +1,185 @@
+<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 @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 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 HH:mm:ss'"
+                                                :show-reset-button="true"
+                                                condition="f_operate_date >= '{}'">
+                                    </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 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_new_userinfo_code"
+                                           condition="f_new_userinfo_code = '{}' " 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_old_userinfo_code"
+                                       condition="f_old_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_new"
+                                       condition=" f_user_name_new like '%{}%'" placeholder='旧客户名称'
+                                       :size="model.f_user_name_new ? model.f_user_name_new.length * 2 : 1">
+                              </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='旧客户名称'
+                                       :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                              </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>
+                              </div>
+                            </div>
+                        </div>
+                    </criteria>
+
+                    <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+                        <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>
+                            </tr>
+                        </template>
+                        <template partial='body'>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_new_userinfo_code}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_user_name_new}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_user_phone_new}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_address_new}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_old_userinfo_code}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_user_name}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_user_phone}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_address}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_meter_brand_style}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_operator}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_operate_date}}</nobr>
+                            </td>
+                        </template>
+                        <template partial='foot'></template>
+                    </data-grid>
+                </criteria-paged>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import {PagedList} from 'vue-client'
+
+    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'
+    }
+    export default {
+      props:['data'],
+      title: '档案合并查询',
+        data() {
+            return {
+                model: new PagedList('rs/sql/mergeFileQuery', 20),
+            }
+        },
+        ready() {
+            readySomething(this).then(() => {
+                this.$emit('ready')
+            }).catch((error) => {
+                this.$emit('error', error)
+            })
+        },
+        methods: {
+            search() {
+                this.$refs.paged.$refs.cri.search()
+            },
+            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
+              }
+                this.model.search(args.condition, args.model)
+            },
+
+            clear() {
+                Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+                    this.$refs.paged.$refs.cri.model[key] = []
+                })
+            },
+            hidden() {
+                this.criteriaShow = !this.criteriaShow
+            }
+        }
+    }
+</script>

package/src/filiale/WEINAN/sale.js

@@ -1,46 +1,48 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  // 其他收费查询
-  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  // 用户稽查查询
-  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
-  //换表查询
-  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
-  //补气查询
-  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
-  //表具查询
-  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
-  //表具档案综合查询
-  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
-  // 业务查询
-  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
-  // 换表查询
-  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
-  // 上报数据查询
-  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
-  // 上报统计分析--抄表分析
-  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
-  // 用气分析明细查询
-  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
-  // 用气分析图表分析
-  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
-  // 启用查询
-  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
-  // 停用查询
-  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
-  // 销户查询
-  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
-  // 汇总查询
-  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
-  // 开户查询
-  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
-  // 购气稽查
-  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  // 其他收费查询
+  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
+  // 用户稽查查询
+  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
+  //换表查询
+  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
+  //补气查询
+  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
+  //表具查询
+  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
+  //表具档案综合查询
+  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
+  // 业务查询
+  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
+  // 换表查询
+  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
+  // 上报数据查询
+  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
+  // 上报统计分析--抄表分析
+  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
+  // 用气分析明细查询
+  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
+  // 用气分析图表分析
+  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
+  // 启用查询
+  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
+  // 停用查询
+  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
+  // 销户查询
+  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
+  // 汇总查询
+  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
+  // 开户查询
+  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
+  // 购气稽查
+  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
+  // 档案合并查询
+  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/reportManage.js

@@ -207,6 +207,10 @@ export default function (filiale) {
   Vue.component('manage-sell-type', (resolve) => {
     require(['./components/SellReport/ManageSellType'], resolve)
   })
+  // 报表展示组件（新营业分析汇总报表）
+  Vue.component('manage-sell-type-new', (resolve) => {
+    require(['./components/SellReport/ManageSellTypeNew'], resolve)
+  })
   // 报表展示组件（用户新增销户统计报表）
   Vue.component('manage-user-count', (resolve) => {
     require(['./components/SellReport/ManageUserCount'], resolve)