manage-client 3.3.81-test → 3.3.83

package/package.json

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

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -9,8 +9,8 @@
                 <div :class="$parent.$parent.style">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
+                              v-model="$parent.$parent.startDate"
+                              :value.sync="$parent.$parent.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true">
                   </datepicker>
@@ -18,8 +18,8 @@
                 <div :class="$parent.$parent.style">
                   <label for="endDate" class="font_normal_body">结束日期</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
+                              v-model="$parent.$parent.endDate"
+                              :value.sync="$parent.$parent.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true">
                   </datepicker>
@@ -214,8 +214,8 @@ import exportConfig from './config/exportConfig'
 import PrintDataSelf from '../../components/sale/common/PrintDataSelf'
 
 let readySomething = async function (self) {
-  self.$refs.paged.$refs.cri.model.startDate = self.getCurrentMonthFirst()
-  self.$refs.paged.$refs.cri.model.endDate = self.getCurrentMonthLast()
+  self.startDate = self.getCurrentMonthFirst()
+  self.endDate = self.getCurrentMonthLast()
   // self.getCompanyList()
 }
 export default {
@@ -241,7 +241,6 @@ export default {
         startDate: 'this.model.startDate',
         endDate: 'this.model.endDate',
         f_user_type : 'this.model.f_user_type',
-
         f_user_usetype : 'this.model.f_user_usetype',
         f_user_usenature : 'this.model.f_user_usenature',
         f_use_institution : 'this.model.f_use_institution'
@@ -412,6 +411,8 @@ export default {
       } else {
         args.condition = `${args.condition}` + this.orgConditionStr
       }
+      this.$refs.paged.$refs.cri.model.startDate = this.startDate
+      this.$refs.paged.$refs.cri.model.endDate = this.endDate
       this.condition = args.condition
       console.log("查看条件",this.condition)
       await this.model.search(args.condition, args.model)
@@ -491,8 +492,8 @@ export default {
     getCondition () {
       return {
         condition: this.condition,
-        startDate: this.$refs.paged.$refs.cri.model.startDate,
-        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        startDate: this.startDate,
+        endDate: this.endDate,
         f_user_usetype : this.$refs.paged.$refs.cri.model.f_user_usetype,
         f_user_type : this.$refs.paged.$refs.cri.model.f_user_type,
         f_user_usenature : this.$refs.paged.$refs.cri.model.f_user_usenature,

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

@@ -179,7 +179,7 @@ export default{
 
 
   changemeterConfig: {
-    'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_address': '客户地址','f_type': '换表类型','f_meternumber_old': '旧表号','f_meternumber': '新表号','f_meter_brand_old': '旧气表品牌',
+    'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_address': '客户地址','f_residential_area': '小区','f_type': '换表类型','f_meternumber_old': '旧表号','f_meternumber': '新表号','f_meter_brand_old': '旧气表品牌',
     'f_meter_brand': '新气表品牌','f_remanent_gas': '补气量','f_remanent_money': '补气金额','f_comments': '备注',
     'f_change_operator': '换表人','f_state': '状态','f_operate_date': '换表日期','f_operator': '人员','f_depname': '部门',
     'f_orgname': '公司','f_meter_type_old': '旧表类型','f_meter_type': '新表类型','f_user_type': '用户类型'

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -27,12 +27,12 @@
                               condition="f_operate_date <= '{}'">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group" v-show="false">
+                <div class="col-sm-2 form-group" >
                   <label class="font_normal_body">客户编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
-                <div class="col-sm-2 form-group" v-show="false">
+                <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 = '{}'" placeholder="客户名称">
@@ -71,6 +71,24 @@
                   <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>-->
+                  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
+                         <!--condition="f_residential_area like '%{}%'" placeholder='小区'>-->
+                <!--</div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            multiple
+                            condition="f_residential_area in {}"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -217,6 +235,9 @@
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
+                <th>
+                  <nobr>小区</nobr>
+                </th>
                 <th>
                   <nobr>换表类型</nobr>
                 </th>
@@ -284,7 +305,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_type}}</nobr>
               </td>
@@ -405,7 +428,7 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
+  import {PagedList, HttpResetClass} from 'vue-client'
   import defaultPrint from '../config/DefaultPrint'
   import exportConfig from '../config/exportConfig'
 
@@ -418,6 +441,7 @@
     // self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
     self.initParams()
+    self.getaddress()
     // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -459,6 +483,7 @@
         sumsmodel: {},
         useinstitutions: [],
         userusenatures: [],
+        residentialArea: [],
         changemeter_fee:[
           {label: '全部', value: ''},
           {label: '销售', value: '> 0'},
@@ -480,6 +505,21 @@
       readySomething(this)
     },
     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 = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
       userUseInstitutionChange () {
         this.userusenatures = []
         this.$refs.paged.$refs.cri.model.f_user_usenature = ''

package/src/filiale/shexian/ChangeMeterQuery.vue

@@ -510,7 +510,7 @@
     </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>
+        <upload  :blodid="selected.f_userinfo_id" :businessid="selected.id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -60,6 +60,51 @@
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <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.id"
+                         condition="id = '{}'" 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_idnumber"
+                         condition="f_idnumber 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">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            multiple
+                            condition="f_residential_area in {}"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div
+                  class="col-sm-2 form-group">
+                  <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
+                  <v-select
+                    v-model="model.f_pcd"
+                    placeholder='选择区域'
+                    :value.sync="model.f_pcd"
+                    :options='$parent.$parent.pcdslist'
+                    condition="f_pcd_id = '{}'"
+                    style="width: 60%"
+                    close-on-select >
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
                   <v-select :value.sync="model.f_payment" multiple
@@ -68,6 +113,35 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数:支付渠道查询">支付渠道</label>
+                  <v-select :value.sync="model.f_bank_type" multiple
+                            v-model="model.f_bank_type"
+                            :options='$parent.$parent.banktype' placeholder='请选择'
+                            condition="f_bank_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_type"
+                            v-model="model.f_type"
+                            :options='$parent.$parent.chargetype' placeholder='请选择'
+                            condition="f_type = '{}'"
+                            close-on-select></v-select>-->
+                  <v-select :value.sync="model.f_type" multiple
+                            :options='$parent.$parent.chargetype' placeholder='请选择'
+                            close-on-select clear-button
+                            condition="f_type in {}"
+                            v-model="model.f_type"></v-select>
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">票据类型</label>-->
+<!--                  <v-select :options='$parent.$parent.papertype'-->
+<!--                            condition="f_paper_type = '{}'"-->
+<!--                            v-model="model.f_paper_type"-->
+<!--                            :value.sync="model.f_paper_type" close-on-select-->
+<!--                            placeholder='请选择'></v-select>-->
+<!--                </div>-->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -90,6 +164,183 @@
                             condition="f_gasproperties_second = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.getPricenames"
+                            condition="f_price_name = '{}'"
+                            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_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select :value.sync="model.f_meter_type" multiple
+                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                            condition="f_meter_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_meter_brand" multiple
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand 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_state" multiple
+                            v-model="model.f_state"
+                            :options='$parent.$parent.charge_state' placeholder='请选择'
+                            condition="f_state 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_bank_name"
+                            v-model="model.f_bank_name"
+                            :options='$parent.$parent.bank' placeholder='请选择'
+                            condition="f_bank_name = '{}'"
+                            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_privilege_money"
+                            v-model="model.f_privilege_money"
+                            :options='$parent.$parent.privilege_money' placeholder='请选择'
+                            condition="f_privilege_money {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">优惠金额</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_privilege_money_big" condition="f_privilege_money >= {}" placeholder='大于等于'>
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_privilege_money_small" condition="f_privilege_money <= {}" placeholder='小于等于'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收&ensp;据&ensp;号</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_bill_number_big" condition="f_bill_number >= {}" placeholder='大于等于'>
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_bill_number_small" condition="f_bill_number <= {}" placeholder='小于等于'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;流水号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
+                         condition="f_serial_id 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_invoice_num"
+                         condition="f_invoice_num = '{}'" placeholder='发票号码'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="发票类型查询">发票类型</label>
+                  <v-select :value.sync="model.f_invoice_type"
+                            v-model="model.f_invoice_type"
+                            :options='$parent.$parent.invoiceType' placeholder='请选择'
+                            condition="f_invoice_type = '{}'"
+                            close-on-select :value-single="true" :search="false">
+                  </v-select>
+                </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_invoiceuse_operator"
+                         condition="f_invoiceuse_operator like '%{}%'" placeholder='开票人'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开票时间</label>
+                  <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
+                              v-model="model.invoice_startDate"
+                              :value.sync="model.invoice_startDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              condition="f_invoice_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">开票时间</label>
+                  <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
+                              v-model="model.invoice_endDate"
+                              :value.sync="model.invoice_endDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              condition="f_invoice_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
+                  <v-select :value.sync="model.f_inputtor"
+                            v-model="model.f_inputtor"
+                            :options='$parent.$parent.inputtores' placeholder='请选择'
+                            condition="f_inputtor = '{}'"
+                            close-on-select :search="false">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
+                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_meter_book_num = '{}'"></v-select>
+                </div>
+                  <div class="col-sm-2 form-group">
+                      <label class="font_normal_body">写卡状态</label>
+                      <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
+                                :options='$parent.$parent.writecard' placeholder='写卡状态'
+                                style="width:60%"
+                                close-on-select
+                                condition="f_write_card = '{}'"></v-select>
+                  </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">街&ensp;&ensp;&ensp;&ensp;道</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_street"
+                         condition="f_street like '%{}%'" placeholder='街道'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">数&ensp;据&ensp;包</label>
+                  <v-select :value.sync="model.f_bluetooth_package" v-model="model.f_bluetooth_package"
+                            :options='$parent.$parent.bluetoothpackage' placeholder='数据包状态'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_bluetooth_package = '{}'"></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">pos设备&nbsp;</label>
+                  <v-select :value.sync="model.f_terminal_name" multiple
+                            v-model="model.f_terminal_name"
+                            :options='$parent.$parent.posEquipment' placeholder='请选择'
+                            condition="f_operator in {}"
+                            close-on-select></v-select>
+                </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_terminal_num"
+                         condition="f_terminal_num like '{}'" placeholder='终端号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
+                  <v-select :value.sync="model.isbgl"
+                            v-model="model.isbgl"
+                            :options='$parent.$parent.bgl' placeholder='请选择'
+                            condition="isbgl = '{}'"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -98,17 +349,26 @@
             <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>-->
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
@@ -121,22 +381,85 @@
                 <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>
+                <th>
+                  <nobr>状态</nobr>
+                </th>
+
+                <th>
+                  <nobr>备注</nobr>
+                </th>
+                <th>
+                  <nobr>补打次数</nobr>
+                </th>
                 <th>
                   <nobr>人员</nobr>
                 </th>
@@ -146,22 +469,85 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
-
+                <th>
+                  <nobr>流水号</nobr>
+                </th>
+                <th>
+                  <nobr>收据号</nobr>
+                </th>
+                <th>
+                  <nobr>业务单号</nobr>
+                </th>
+                <th>
+                  <nobr>发票号码</nobr>
+                </th>
+                <th>
+                  <nobr>发票类型</nobr>
+                </th>
+                <th>
+                  <nobr>开票人</nobr>
+                </th>
+                <th>
+                  <nobr>开票时间</nobr>
+                </th>
+                <th>
+                  <nobr>是否征税</nobr>
+                </th>
+                <th>
+                  <nobr>累计写卡气量</nobr>
+                </th>
+                <th>
+                  <nobr>实际写卡金额</nobr>
+                </th>
+                <th>
+                  <nobr>冲正人</nobr>
+                </th>
+                <th>
+                  <nobr>冲正时间</nobr>
+                </th>
                   <th>
                       <nobr>一阶气量</nobr>
                   </th>
+                  <th>
+                      <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.id}}</nobr>
+              </td>
               <td style="text-align: center;"><nobr>
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_street}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
@@ -180,20 +566,87 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_gasproperties_second}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_meter_brand}}</nobr>
+                </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_card_id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_times}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_pregas}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.fee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_delaypay}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_preamount}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_charge_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yucun}}</nobr>
+              </td>
+
               <td style="text-align: center;">
                 <nobr>{{row.f_collection}}</nobr>
               </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_rest_date}}</nobr>-->
+              <!--</td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_privilege_money}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr >{{row.f_balance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_curbalance}}</nobr>
+
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
+              </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_write_card}}</nobr>
+                </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bank_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bank_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_terminal_num}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bluetooth_package}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.filltimes}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operator}}</nobr>
@@ -203,16 +656,76 @@
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_serial_id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_serial_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_invoice_num}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_invoice_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_invoiceuse_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_invoice_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tax_logotype}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_write_totalgas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_write_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_corr_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_corr_operate_date}}</nobr>
               </td>
                 <td style="text-align: center;">
                     <nobr>{{row.f_stairamount1}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_stair1price}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                    <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
+                </td>
                 <td style="text-align: center;">
                     <nobr>{{row.f_stair2amount}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_stair2price}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                    <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
+                </td>
                 <td style="text-align: center;">
                     <nobr>{{row.f_stair3amount}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_stair3price}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                    <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.isbgl}}</nobr>
+                </td>
+              <td style="text-align: center;"><nobr>
+                <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+              </nobr></td>
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -226,12 +739,42 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               气量合计:&emsp;{{sumsmodel.f_pregas}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              气费金额合计:&emsp;{{sumsmodel.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_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_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_yucun}}
+            </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               实际收款合计:&emsp;{{sumsmodel.f_collection}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              优惠合计:&emsp;{{sumsmodel.f_privilege_money}}
+            </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                  一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                  一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                  二阶气量合计:&emsp;{{sumsmodel.f_stair2amount}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                  二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                  三阶气量合计:&emsp;{{sumsmodel.f_stair3amount}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                  三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
+              </td>
           </tr>
         </table>
       </div>
@@ -295,7 +838,7 @@
         isSingleUser: null,
         startDate1:'',
         endDate1:'',
-        resshow:['company','department','operator'],
+        resshow:['company','department','operator','slicearea'],
         other:[],
         pcdslist:[],
 

package/src/filiale/tongchuan/config/exportConfig.js

@@ -63,10 +63,14 @@ export default{
     'f_depname': '部门','f_orgname': '公司'
   },
   chargeConfig: {
-    'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address': '客户地址','f_operate_date': '收费日期',
-    'f_pregas': '气量','f_preamount': '燃气费','f_collection': '收款',
-    'f_gasproperties': '用气性质','f_gasproperties_second': '二级用气性质', 'f_payment': '付款方式','f_orgname': '公司',
-    'f_depname': '部门','f_operator': '操作员'
+    'id': '收费编号', 'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_user_phone': '客户电话','f_address': '客户地址','f_zones':'片区', 'f_user_type': '客户类型',
+    'f_gasproperties': '用气性质', 'f_meternumber': '表号','f_meter_brand': '气表品牌','f_times':'购气次数',
+    'f_pregas': '气量','fee': '金额','f_preamount': '燃气费','f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
+    'f_curbalance': '本期结余','f_type': '收费类型','f_payment': '付款方式','f_bank_type': '支付渠道','f_state': '状态','f_operate_date': '收费日期',
+    'f_delaypay': '滞纳金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司',
+    'f_yucun': '预存金额','f_card_id': '卡号','f_stairamount1':"一阶气量",'f_stair1price':"一阶单价",'f_stair1fee':"一阶气费",
+    'f_stair2amount': "二阶气量",'f_stair2price': "二阶单价",'f_stair2fee':"二阶气费",
+    'f_stair3amount':"三阶气量",'f_stair3price': "三阶单价",'f_stair3fee':"三阶气费",'f_inputtor':"抄表员",'f_serial_id':'流水号','f_tax_logotype':'是否征税','f_terminal_num':'终端号'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'

package/src/main.js

@@ -6,7 +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/tongchuan/sale'
+import ShanXianSaleManage from './filiale/shanxian/sale'
 import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'