manage-client 3.3.31 → 3.3.33

package/package.json

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

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -91,7 +91,7 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">表&ensp;&ensp;&ensp;&ensp;号</label>
                 <input
-                  class="input_search" condition="f_meternumber = '{}'"
+                  class="input_search" condition="u1.f_meternumber = '{}'"
                   placeholder='表号'
                   style="width:60%"
                   type="text"
@@ -340,7 +340,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       getorg(condition,obj) {
-        this.orgcondition = condition
+        this.orgcondition = condition.replace('f_orgid','i.f_orgid')
         this.orgname = obj.orgnames[0]
       },
       initQueryParam () {

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -6,6 +6,26 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">按单位查询</label>
+                  <v-select :value.sync="$parent.$parent.f_is_company"
+                            :options='$parent.$parent.isCompany'
+                            placeholder='请选择' v-model="$parent.$parent.f_is_company"
+                            @change="$parent.$parent.isCompanyChange()"
+                            value-single="true"
+                            :disabled="$parent.$parent.isCompanyShow"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">按小区查询</label>
+                  <v-select :value.sync="$parent.$parent.f_is_area"
+                            :options='$parent.$parent.isArea'
+                            placeholder='请选择' v-model="$parent.$parent.f_is_area"
+                            @change="$parent.$parent.isAreaChange()"
+                            value-single="true"
+                            :disabled="$parent.$parent.isAreaShow"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -24,28 +44,6 @@
                               :show-reset-button="true">
                   </datepicker>
                 </div>
-                <res-select-group
-                  :show-component="['company','slicearea']"
-                  :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>
-                  <v-select :value.sync="model.f_user_type"
-                            :options='$parent.$parent.usertypes'
-                            placeholder='请选择' v-model="model.f_user_type"
-                            condition="f_user_type = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">使用类型</label>
-                  <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
-                            :options='$parent.$parent.useTypes' placeholder='请选择'
-                            style="width:60%"
-                            close-on-select
-                            condition="f_usetype = '{}'"></v-select>
-                </div>
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
 
@@ -62,6 +60,81 @@
                               titletable="用户查询" :starthead="$parent.$parent.startDate"
                               :defaultfield="$parent.$parent.defaultfield"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div
+                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                    @click="$parent.$parent.hidden()"
+                    class="button_spacing"
+                    style="float: right"></div>
+                </div>
+              </div>
+              <div class="row" v-if="$parent.$parent.criteriaShow">
+                <res-select-group
+                  :show-component="['company','slicearea']"
+                  :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>
+                  <v-select :value.sync="model.f_user_type"
+                            :options='$parent.$parent.usertypes'
+                            @change="$parent.$parent.userTypeChange()"
+                            placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
+                  <v-select :value.sync="model.f_user_usetype" :search="false"
+                            @change="$parent.$parent.userUseTypeChange()"
+                            v-model="model.f_user_usetype"
+                            :options='$parent.$parent.userusetypes'
+                            condition="f_user_usetype = '{}'"
+                            placeholder='用气类型'
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_use_institution" class="font_normal_body">用气机构</label>
+                  <v-select :value.sync="model.f_use_institution" :search="false"
+                            @change="$parent.$parent.userUseInstitutionChange()"
+                            v-model="model.f_use_institution"
+                            :options='$parent.$parent.useinstitutions'
+                            condition="f_use_institution = '{}'"
+                            placeholder='用气机构'
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
+                  <v-select :value.sync="model.f_user_usenature" :search="false"
+                            v-model="model.f_user_usenature"
+                            :options='$parent.$parent.userusenatures'
+                            condition="f_user_usenature = '{}'"
+                            placeholder='使用性质'
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">单位名称</label>
+                  <v-select :value.sync="model.f_company_id"
+                            class="select_list select"
+                            enter-push :disabled="$parent.$parent.isCompanyShow"
+                            v-model="model.f_company_id" multiple="true"
+                            :options='$parent.$parent.corporatename' placeholder='单位名称'
+                            condition="f_company_id in {}">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">小区名称</label>
+                  <v-select :value.sync="model.f_residential_area_id"
+                            class="select_list select"
+                            enter-push :disabled="$parent.$parent.isAreaShow"
+                            v-model="model.f_residential_area_id" multiple="true"
+                            @select-search="$parent.$parent.getAreaList"
+                            :options='$parent.$parent.areaList' placeholder='小区名称'
+                            condition="f_residential_area_id in {}">
+                  </v-select>
                 </div>
               </div>
             </div>
@@ -72,13 +145,19 @@
                 <th>
                   <nobr>序号</nobr>
                 </th>
-                <th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                   <nobr>用户编号</nobr>
                 </th>
-                <th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                   <nobr>用户名称</nobr>
                 </th>
-                <th>
+                <th v-show="$parent.$parent.$parent.isAreaShow">
+                  <nobr>单位名称</nobr>
+                </th>
+                <th v-show="$parent.$parent.$parent.isCompanyShow">
+                  <nobr>小区名称</nobr>
+                </th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                   <nobr>购气（充值）时间</nobr>
                 </th>
                 <th>
@@ -87,34 +166,40 @@
                 <th>
                   <nobr>一阶气量</nobr>
                 </th>
-                <th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
                   <nobr>二阶气量</nobr>
                 </th>
-                <th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
                   <nobr>三阶气量</nobr>
                 </th>
                 <th>
                   <nobr>实收款</nobr>
                 </th>
-                <th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                   <nobr>购气网点</nobr>
                 </th>
-                <th>
+                <th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                   <nobr>操作员</nobr>
                 </th>
               </tr>
             </template>
             <template partial='body'>
               <td style="text-align:center">
-                <nobr>{{ $index+1 }}</nobr>
+                <nobr>{{ $index + 1 }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_userinfo_code }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="$parent.$parent.$parent.isAreaShow">
+                <nobr>{{ row.f_company_name }}</nobr>
+              </td>
+              <td style="text-align: center;" v-show="$parent.$parent.$parent.isCompanyShow">
+                <nobr>{{ row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_user_name }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_operate_date }}</nobr>
               </td>
               <td style="text-align: center;">
@@ -123,19 +208,19 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_stairamount1 }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_stairamount2 }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_stairamount3 }}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_collection }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_depname }}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_operator }}</nobr>
               </td>
             </template>
@@ -179,6 +264,8 @@ import PrintDataSelf from '../../components/sale/common/PrintDataSelf'
 let readySomething = async function (self) {
   self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
   self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.getCompanyList()
+  self.getAreaList()
 }
 export default {
   title: '用户查询',
@@ -195,11 +282,14 @@ export default {
       depname: [],
       operatorname: '',
       condition: '',
-      orgCondtionStr: '',
+      orgConditionStr: '',
       data: {},
       other: [],
       footer: [],
-      model: new PagedList('rs/sql/manage_chargeSummary', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+      model: new PagedList('rs/sql/manage_chargeSummary', 20, {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate'
+      }, {
         f_collection: 0,
         f_gas: 0,
         f_money: 0
@@ -207,7 +297,7 @@ export default {
       gasproperties: [],
       show: false,
       rowdata: {},
-      residentialArea: [],
+      areaList: [],
       modelval: [],
       startDate: '',
       endDate: '',
@@ -220,10 +310,21 @@ export default {
       defaultfield: [],
       sumsmodel: {},
       initres: {
-        org:[this.$login.f.orgid],
+        org: [this.$login.f.orgid],
         slice_area: [],
       },
-      sumExport: {'f_gas':'卡表购气', 'f_collection':'实收款', 'f_money':'物联表充值'}
+      criteriaShow: false,
+      userusetypes: [],
+      useinstitutions: [],
+      userusenatures: [],
+      sumExport: {'f_gas': '卡表购气', 'f_collection': '实收款', 'f_money': '物联表充值'},
+      isCompany: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+      isArea: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+      f_is_company: '否',
+      f_is_area: '否',
+      isCompanyShow: false,
+      isAreaShow: false,
+      corporatename: []
     }
   },
   ready () {
@@ -234,6 +335,114 @@ export default {
     })
   },
   methods: {
+    async getCompanyList(searchText){
+      let condition = ' 1 = 1 '
+      if (searchText) {
+        condition = ` f_company_name like '%${searchText}%' `
+      }
+      let HttpReset = new HttpResetClass()
+      HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
+        data: {
+          items: 'f_company_name, id',
+          tablename: 't_company',
+          orderitem: 'id desc',
+          condition: condition
+        }
+      }, {resolveMsg: null, rejectMsg: '获取单位信息失败!'}).then((req) => {
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_company_name,
+            value: row.id
+          }
+        })
+        this.corporatename = [{label: '全部', value: ''}, ...redata]
+      })
+    },
+    getAreaList (searchText) {
+      let condition = ' 1 = 1 '
+      if (searchText) {
+        condition = ` f_residential_area like '%${searchText}%' `
+      }
+      let HttpReset = new HttpResetClass()
+      HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
+        data: {
+          items: 'f_residential_area, id',
+          tablename: 't_area',
+          orderitem: 'id desc',
+          condition: condition
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_residential_area,
+            value: row.id
+          }
+        })
+        this.areaList = [{label: '全部', value: ''}, ...redata]
+      })
+    },
+    isAreaChange () {
+      if(this.f_is_area){
+        if (this.f_is_area == '是') {
+          this.isCompanyShow = true
+          this.model = new PagedList('rs/sql/manage_chargeSummaryByArea', 20, {
+            startDate: 'this.model.startDate',
+            endDate: 'this.model.endDate',
+            condition2: 'this.model.condition2'
+          }, {f_collection: 0, f_gas: 0, f_money: 0})
+        } else {
+          this.isCompanyShow = false
+          this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
+            startDate: 'this.model.startDate',
+            endDate: 'this.model.endDate'
+          }, {f_collection: 0, f_gas: 0, f_money: 0})
+        }
+      }
+    },
+    isCompanyChange () {
+      if (this.f_is_company) {
+        if (this.f_is_company == '是') {
+          this.isAreaShow = true
+          this.model = new PagedList('rs/sql/manage_chargeSummaryByCompany', 20, {
+            startDate: 'this.model.startDate',
+            endDate: 'this.model.endDate',
+            condition2: 'this.model.condition2'
+          }, {f_collection: 0, f_gas: 0, f_money: 0})
+        } else {
+          this.isAreaShow = false
+          this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
+            startDate: 'this.model.startDate',
+            endDate: 'this.model.endDate'
+          }, {f_collection: 0, f_gas: 0, f_money: 0})
+        }
+      }
+    },
+    userTypeChange () {
+      this.userusetypes = []
+      if (this.$refs.paged.$refs.cri.model.f_user_type.length === 1) {
+        let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
+        this.userusetypes = this.$appdata.getParam(str)
+      }
+    },
+    userUseInstitutionChange () {
+      this.userusenatures = []
+      if (this.$refs.paged.$refs.cri.model.f_use_institution.length === 1) {
+        let str = this.$refs.paged.$refs.cri.model.f_use_institution[0] + '使用性质'
+        this.userusenatures = this.$appdata.getParam(str)
+      }
+    },
+    userUseTypeChange () {
+      this.useinstitutions = []
+      if (this.$refs.paged.$refs.cri.model.f_user_usetype.length === 1) {
+        let str = this.$refs.paged.$refs.cri.model.f_user_usetype[0] + '机构'
+        this.useinstitutions = this.$appdata.getParam(str)
+      }
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
     getotherfooter () {
       this.other = []
       this.footer = []
@@ -252,22 +461,48 @@ export default {
     search () {
       this.$refs.paged.$refs.cri.search()
     },
+    appendCondition (data) {
+      console.log('data=====>',data)
+      let stringValue = ''
+      for (var i = 0; i < data.length; i++) {
+        if (data[i]) {
+          if (i === data.length - 1) {
+            stringValue = stringValue + "'" + data[i] + "'"
+          } else {
+            stringValue = stringValue + "'" + data[i] + "',"
+          }
+        }
+      }
+      return stringValue
+    },
     async selfSearch (args) {
-      if (!this.orgCondtionStr) {
-        args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
+      let companyCondition2 = '1=1'
+      if (!this.orgConditionStr) {
+        args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        companyCondition2 = companyCondition2 + ' and f_orgid = ' + this.$login.f.orgid
       } else {
-        args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = `${args.condition}` + this.orgConditionStr
+        companyCondition2 = companyCondition2 + this.orgConditionStr
       }
+      if (this.isAreaShow || this.isCompanyShow) {
+        if (args.model.f_company_id.length > 0) {
+          companyCondition2 = companyCondition2 + ' and id in (' + await this.appendCondition(args.model.f_company_id) + ')'
+        }
+        if (args.model.f_residential_area_id.length > 0) {
+          companyCondition2 = companyCondition2 + ' and id in (' + await this.appendCondition(args.model.f_residential_area_id) + ')'
+        }
+      }
+      args.model.condition2 = companyCondition2
       this.condition = args.condition
       console.log("查看条件",this.condition)
       await this.model.search(args.condition, args.model)
-      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-      this.card=''
-      this.IdCardInfo=''
-      console.log('合计字段',this.sumsmodel)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      this.card = ''
+      this.IdCardInfo = ''
+      console.log('合计字段', this.sumsmodel)
     },
-    getRes(obj) {
-      this.orgCondtionStr = obj
+    getRes (obj) {
+      this.orgConditionStr = obj
     },
     stamp () {
       this.all = false
@@ -338,13 +573,22 @@ export default {
       return {
         condition: this.condition,
         startDate: this.$refs.paged.$refs.cri.model.startDate,
-        endDate: this.$refs.paged.$refs.cri.model.endDate
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition2: this.$refs.paged.$refs.cri.model.condition2
       }
     },
     getfield () {
-      return exportConfig.manageChargeSummaryConfig
+      let field
+      if (this.isAreaShow) {
+        field = exportConfig.manageChargeSummaryByCompanyConfig
+      } else if (this.isCompanyShow) {
+        field = exportConfig.manageChargeSummaryByAreaConfig
+      } else {
+        field = exportConfig.manageChargeSummaryConfig
+      }
+      return field
     },
-    useTypes() {
+    useTypes () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
     },
     usertypes () {

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

@@ -831,6 +831,20 @@ monthGasConfig: {
     'f_collection': '实收款',
     'f_depname': '购气网点',
     'f_operator': '操作员'
+  },
+  manageChargeSummaryByCompanyConfig: {
+    'f_company_name': '单位名称',
+    'f_pregas': '购气（充值）数量',
+    'f_stairamount1': '一阶气量',
+    'f_collection': '实收款',
+  },
+  manageChargeSummaryByAreaConfig: {
+    'f_residential_area': '小区名称',
+    'f_pregas': '购气（充值）数量',
+    'f_stairamount1': '一阶气量',
+    'f_stairamount2': '二阶气量',
+    'f_stairamount3': '三阶气量',
+    'f_collection': '实收款'
   }
 }
 

package/src/filiale/shanxian/NewQueryInstruct.vue

@@ -91,7 +91,7 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">表&ensp;&ensp;&ensp;&ensp;号</label>
                 <input
-                  class="input_search" condition="f_meternumber = '{}'"
+                  class="input_search" condition="u1.f_meternumber = '{}'"
                   placeholder='表号'
                   style="width:60%"
                   type="text"
@@ -338,7 +338,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       getorg(condition,obj) {
-        this.orgcondition = condition
+        this.orgcondition = condition.replace('f_orgid','i.f_orgid')
         this.orgname = obj.orgnames[0]
       },
       initQueryParam () {

package/src/filiale/wenxi/ChargeQuery.vue

@@ -686,42 +686,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.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_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>
+<!--            <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>