manage-client 3.2.0 → 3.2.4

package/package.json

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

package/src/components/SellReport/SellBySelfHelp.vue

@@ -0,0 +1,263 @@
+<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>
+        <p class="bg-info text-center" style="padding: 8px;">自助结账报表</p>
+      <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+        <div class="row">
+            <div class="col-sm-4" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+          <div class="col-sm-4">
+            <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-4">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+            <res-select restype='user'
+                        @res-select="$parent.$parent.getuser"
+                        :parentresid="$parent.$parent.userresid"
+                        :initresid='$parent.$parent.operatorid'>
+            </res-select>
+          </div>
+        </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>
+        </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='17' style="font-weight: normal; text-align: left;">
+            <h3 style="text-align: center">自助结账报表</h3>
+          </th>
+        </tr>
+        <tr>
+          <th colspan='17' style="font-weight: normal; text-align: center;">
+            开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+            结束时间：{{ model.model.endDate }}
+          </th>
+        </tr>
+        <tr>
+          <th colspan='17' style="font-weight: normal; text-align: center;">
+            <div>
+              <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+              <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+            </div>
+          </th>
+        </tr>
+        </thead>
+        <tr>
+          <td colspan='17'>
+            {{{ model.data.substring(26,model.data.length-8) }}}
+          </td>
+        </tr>
+      </table>
+      {{{ $parent.reportStr}}}
+    </div>
+  </criteria-paged>
+  <modal :show.sync="show" v-ref:modal small backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">输入文件名称</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+      <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+    </footer>
+  </modal>
+  </div>
+</template>
+
+<script>
+  import { DataModel } from 'vue-client'
+  import co from 'co'
+  let saveFile = function * (self) {
+    // 线验证文件是否重名
+    let count = yield self.$resetpost('rs/sql/manageSingleTable',
+      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+      {resolveMsg: null, rejectMsg: null})
+    if (count.data.length > 0) {
+      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+      return
+    }
+    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+      f_outlets: this.$login.f.depname})
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+  }
+  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: '',
+        qishiDate:'',
+        jieshuDate:'',
+        startDate:'',
+        endDate:'',
+        operatorname: '',
+        f_inputtor:[],
+        f_user_type:'',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/sellBySelfHelp',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  depname:'this.model.depname',
+                  operatorname:'this.model.operatorname',
+                  qishiDate:'this.model.startDate.substring(0,10)',
+                  jieshuDate:'this.model.endDate.substring(0,10)'
+          },
+        ),
+
+        reportStr: null,
+        show: false
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.search()
+      console.log(this.$login.f)
+    },
+
+    methods: {
+
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        let orgcondition = '1 = 1'
+        if (this.f_orgid[0]){
+          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+        }
+        if (this.f_depid[0]) {
+          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+        }
+        if(this.depname){
+          this.$refs.paged.$refs.criteria.model.depname = this.depname
+        }else{
+          this.$refs.paged.$refs.criteria.model.depname = '无'
+        }
+
+        if(this.operatorname){
+          this.$refs.paged.$refs.criteria.model.operatorname = this.operatorname
+        }else{
+          this.$refs.paged.$refs.criteria.model.operatorname = '无'
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      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
+      },
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.reportStr = res.data.filecontent
+          this.model.state = '正确'
+        })
+      },
+      confirm () {
+        if (!this.filename || this.filename === '') {
+          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+        }
+        let saveGen = saveFile(this)
+        co(saveGen)
+      },
+      close () {
+        this.show = false
+      },
+      // 将报表保存成文件
+      confirmReport () {
+        this.show = true
+        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+      },
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      }
+    },
+    computed: {
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

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

@@ -6,33 +6,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"
-                                  @re-res="$parent.$parent.getRes"
-                                  :show-component="['company','department','operator']"
-                                  v-ref:sel></res-select-group>
-
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="OpertoerCollection"
-                                template-name='操作员日结列表'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model"
-                              :field="$parent.$parent.getfield"
-                              :sum-field="$parent.$parent.getfield"
-                              titletable="操作员日结列表"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-
-              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -59,7 +32,34 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
+                <res-select-group :initres="$parent.$parent.initres"
+                                  @re-res="$parent.$parent.getRes"
+                                  :show-component="['company','operator']"
+                                  v-ref:sel></res-select-group>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="OpertoerCollection"
+                                template-name='操作员日结列表'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model"
+                              :field="$parent.$parent.getfield"
+                              :sum-field="$parent.$parent.getfield"
+                              titletable="操作员日结列表"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+<!--                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
+                </div>
               </div>
+
+<!--              <div class="row" v-show="$parent.$parent.criteriaShow">-->
+
+<!--              </div>-->
             </div>
           </criteria>
 
@@ -78,9 +78,6 @@
                 <th>
                   <nobr>售气金额</nobr>
                 </th>
-                <th>
-                  <nobr>维护费</nobr>
-                </th>
                 <th>
                   <nobr>上期结余</nobr>
                 </th>
@@ -90,6 +87,18 @@
                 <th>
                   <nobr>气费滞纳金</nobr>
                 </th>
+                <th>
+                  <nobr>退费</nobr>
+                </th>
+                <th>
+                  <nobr>冲正气量</nobr>
+                </th>
+                <th>
+                  <nobr>冲正金额</nobr>
+                </th>
+                <th>
+                  <nobr>冲正滞纳金</nobr>
+                </th>
                 <th>
                   <nobr>发卡数</nobr>
                 </th>
@@ -97,7 +106,10 @@
                   <nobr>发卡费</nobr>
                 </th>
                 <th>
-                  <nobr>工本费</nobr>
+                  <nobr>其他数</nobr>
+                </th>
+                <th>
+                  <nobr>其他费</nobr>
                 </th>
                 <th>
                   <nobr>补卡数</nobr>
@@ -106,7 +118,7 @@
                   <nobr>补卡费</nobr>
                 </th>
                 <th>
-                  <nobr>小计</nobr>
+                  <nobr>实收金额</nobr>
                 </th>
               </tr>
             </template>
@@ -115,16 +127,20 @@
               <td style="text-align: center;">{{row.c}}</td>
               <td style="text-align: center;">{{row.f_pregas}}</td>
               <th style="text-align: center;">{{row.f_preamount}}</th>
-              <th style="text-align: center;">{{row.f_wmoney}}</th>
               <th style="text-align: center;">{{row.f_balance}}</th>
               <th style="text-align: center;">{{row.f_curbalance}}</th>
               <th style="text-align: center;">{{row.f_delaypay}}</th>
+              <th style="text-align: center;">{{row.f_returnfee}}</th>
+              <th style="text-align: center;">{{row.f_czpregas}}</th>
+              <th style="text-align: center;">{{row.f_czpreamount}}</th>
+              <th style="text-align: center;">{{row.f_czdelaypay}}</th>
               <th style="text-align: center;">{{row.fkcardnum}}</th>
               <th style="text-align: center;">{{row.f_fkcardfees}}</th>
+              <th style="text-align: center;">{{row.gc}}</th>
               <th style="text-align: center;">{{row.f_gmoney}}</th>
               <th style="text-align: center;">{{row.cardnum}}</th>
               <th style="text-align: center;">{{row.f_cardfees}}</th>
-              <th style="text-align: center;">{{row.sumall}}</th>
+              <th style="text-align: center;">{{row.f_collection}}</th>
             </template>
           </data-grid>
         </criteria-paged>
@@ -144,22 +160,40 @@
               售气金额合计:&emsp;{{sumsmodel.f_preamount}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              维护费合计:&emsp;{{sumsmodel.f_wmoney}}
+              气费滞纳金合计:&emsp;{{sumsmodel.f_delaypay}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              气费滞纳金合计:&emsp;{{sumsmodel.f_delaypay}}
+              退费合计:&emsp;{{sumsmodel.f_returnfee}}
+            </td>
+           <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              冲正气量合计:&emsp;{{sumsmodel.f_czpregas}}
+            </td>
+           <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              冲正金额合计:&emsp;{{sumsmodel.f_czpreamount}}
+            </td>
+           <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              冲正滞纳金合计:&emsp;{{sumsmodel.f_czdelaypay}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              发卡数合计:&emsp;{{sumsmodel.fkcardnum}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               发卡费合计:&emsp;{{sumsmodel.f_fkcardfees}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              工本费合计:&emsp;{{sumsmodel.f_gmoney}}
+              其他数合计:&emsp;{{sumsmodel.gc}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              其他费合计:&emsp;{{sumsmodel.f_gmoney}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              补卡数合计:&emsp;{{sumsmodel.cardnum}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               补卡费合计:&emsp;{{sumsmodel.f_cardfees}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总合计:&emsp;{{sumsmodel.sumall}}
+              实收金额合计:&emsp;{{sumsmodel.f_collection}}
             </td>
           </tr>
         </table>
@@ -204,12 +238,18 @@
             c: 0,
             f_pregas: 0,
             f_preamount: 0,
-            f_wmoney: 0,
             f_delaypay: 0,
+            f_returnfee: 0,
+            f_czpregas: 0,
+            f_czpreamount: 0,
+            f_czdelaypay: 0,
+            fkcardnum: 0,
             f_fkcardfees: 0,
+            gc: 0,
             f_gmoney: 0,
+            cardnum: 0,
             f_cardfees: 0,
-            sumall: 0
+            f_collection: 0
           }),
         orgCondtionStr: '',
 

package/src/components/sale/config/exportConfig.js

@@ -115,9 +115,10 @@ export default{
 
   ProceedsOperConfig: {
     'f_operate_date': '日期', 'c': '售气笔数', 'f_pregas': '售气气量', 'f_preamount': '售气金额',
-    'f_wmoney': '维护费', 'f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_delaypay': '气费滞纳金',
-    'fkcardnum': '发卡数', 'f_fkcardfees': '发卡费', 'f_gmoney': '工本费', 'cardnum': '补卡数',
-    'f_cardfees': '补卡费', 'sumall': '小计'
+    'f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_delaypay': '气费滞纳金',
+    'f_returnfee': '退费','f_czpregas': '冲正气量','f_czpreamount': '冲正金额','f_czdelaypay': '冲正滞纳金',
+    'fkcardnum': '发卡数', 'f_fkcardfees': '发卡费', 'gc': '其他数','f_gmoney': '其他费', 'cardnum': '补卡数',
+    'f_cardfees': '补卡费', 'f_collection': '实收金额'
   },
 
   arrearsConfig: {

package/src/filiale/WEINAN/EchartsBox.vue

@@ -0,0 +1,110 @@
+<template lang="html">
+  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
+    <div class="form-horizontal select-overspread container-fluid auto">
+      <div class="row">
+        <div class="col-sm-3 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="[]"
+                      class="datepicker"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">结束日期:</label>
+          <datepicker id="endDate" placeholder="结束日期"
+                      style="width:60%"
+                      class="datepicker"
+                      v-model="model.endDate"
+                      :value.sync="model.endDate"
+                      :disabled-days-of-Week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">使用公司:</label>
+          <res-select restype='organization'
+                      @res-select="getRes"
+                      :initresid="model.id">
+          </res-select>
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;">
+      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
+        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></site-manager>
+        </div>
+        <div style="flex: 1;width: 50%">
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></bank-manager>
+        </div>
+      </div>
+      <div class="flex-row" style="flex: 1;height: 48%">
+
+        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
+          <div  style="flex: 1;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
+          </div>
+          <!--          <div style="flex: 1;">-->
+          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
+          <!--          </div>-->
+        </div>
+
+        <div style="flex: 1;width: 50%">
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import * as Util from '../../Util'
+
+  export default {
+    props: {
+      classname: {
+        type: String,
+        default: 'basic-main'
+      },
+      width: {
+        type: String,
+        default: '98.5%'
+      },
+      height: {
+        type: String,
+        default: '98%'
+      }
+    },
+    data() {
+      return {
+        jurisdiction: this.$login.r,
+        model: {
+          id: [this.$login.f.orgid],
+          orgid: [this.$login.f.orgid],
+          startDate: Util.toStandardDateString(),
+          endDate: Util.toStandardDateString()
+        }
+      }
+    },
+    methods: {
+      searchdata() {
+        this.$refs.pay.searchdata()
+      },
+      getRes(obj) {
+        this.model.orgid = obj
+      },
+    }
+  }
+</script>
+
+<style lang="css">
+</style>

package/src/filiale/WEINAN/SiteManager.vue

@@ -0,0 +1,191 @@
+<template lang="html">
+  <div id="charts">
+    <div id="gph" :style="{width:'100%',height:'100%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST','rs/sql/getPregas',
+  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    let data = res.data
+    // let xPro = Array.from(new Set(res.data.map(x => x.f_gasproperties)))
+    // 表型
+    let xPro = data.map(x => x.f_meter_type)
+    // 居民用气
+    let yNumJM = data.map(x => x.f_ptpregas)
+    let yNumBGL = data.map(x => x.f_bglpregas)
+    let yNumJZCN = data.map(x => x.f_cnpregas)
+    let yNumGF = data.map(x => x.f_gfpregas)
+    let yNumFJM = data.map(x => x.f_fjmpregas)
+    // xPro.forEach(item => {
+    //   yNumJB[yNumJB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '机表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    //   yNumKB[yNumKB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '卡表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    //   yNumWLWB[yNumWLWB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '物联网表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    // })
+    console.log('表型', xPro)
+    console.log('居民用气', yNumJM)
+    console.log('壁挂炉用气', yNumBGL)
+    console.log('集中采暖', yNumJZCN)
+    console.log('公福用气', yNumGF)
+    console.log('非居民用气', yNumFJM)
+    // self.texttile = '用户类型'
+    // let arrparams = []
+    // let numdata = []
+    // let gasdata = []
+    // let pricedata = []
+    // for (var i = 0; i < res.data.length; i++) {
+    //     arrparams[i] = res.data[i].name
+    //     numdata[i] = res.data[i].num_value
+    //     gasdata[i] = res.data[i].gas_value
+    //     pricedata[i] = res.data[i].money_value
+    // }
+    self.set(xPro,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   title: '用户购(用)气'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM) {
+     this.xc = echarts.init(document.getElementById('gph'))
+     this.xc.setOption({
+       title : {
+         text: '用户购(用)气',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+       tooltip : {
+         trigger: 'axis'
+       },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['居民用气','壁挂炉用气','集中采暖','公福用气','非居民用气']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           axisLabel :{
+             interval:0
+           },
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'居民用气',
+          type:'bar',
+          data:yNumJM,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'壁挂炉用气',
+          type:'bar',
+          data:yNumBGL,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'集中采暖',
+          type:'bar',
+          data:yNumJZCN,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        },
+        {
+          name:'公福用气',
+          type:'bar',
+          data:yNumGF,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        },
+        {
+          name:'非居民用气',
+          type:'bar',
+          data:yNumFJM,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen =getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'orgid' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>

package/src/filiale/WEINAN/config/tableConfig.js

@@ -4,16 +4,15 @@ export default{
     {
       "用户编号":"f_userinfo_code",
       "用户名称":"f_user_name",
-      "表号":"f_meternumber",
-      "开户日期":"f_open_date",
-      "本次抄表底数":"f_tablebase",
+      "气表品牌":"f_meter_brand",
+      "气表编号":"f_meternumber",
       "上次抄表底数":"f_last_tablebase",
+      "本次抄表底数":"f_tablebase",
       "用气量":"f_oughtamount",
-      "单价":"f_price",
-      "用气金额":"f_oughtfee",
       "表内剩余余额":"f_jval",
-      "回传时间":"f_insert_date",
-      "上次回传日期":"f_last_insertdate"
+      "抄表日期":"f_insert_date",
+      "上次抄表日期":"f_last_insertdate",
+      "阀门开启状态":"f_valvestate"
     }
 
 }

package/src/filiale/WEINAN/reportManage.js

@@ -0,0 +1,12 @@
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'echarts-box': (resolve) => { require(['./EchartsBox'], resolve) },
+  'site-manager': (resolve) => { require(['./SiteManager'], resolve) },
+
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/tongchuan/ReportList.vue

@@ -306,10 +306,13 @@
         let brandArr = []
         this.$MagGetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
           temp.label = item.label
           temp.value = item.value.f_meter_brand
           brandArr.push(temp)
+        }
         })
+
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
         //初始化气表价格
         this.prices = this.$MagGetSaleParam.getPrices();

package/src/reportManage.js

@@ -468,6 +468,10 @@ export default function (filiale) {
   Vue.component('sell-check-two', (resolve) => {
     require(['./components/SellReport/OperatorCheckoutTwo'], resolve)
   })
+  // 自助结账报表
+  Vue.component('sell-BySelf-Help', (resolve) => {
+    require(['./components/SellReport/SellBySelfHelp'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale