manage-client 3.1.13 → 3.1.14-ls

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -50,7 +50,7 @@
                             sqlurl="rs/logic/exportfile" sql-name="DrillErrorByUserinfo" template-name='异常分析'
                             :choose-col="true"></export-excel>
                 <!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
-                <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+<!--                <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
               <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>
@@ -298,12 +298,8 @@
     <new-exception-eform-total :condition="condition" :startdate="startDate"
                          :enddate="endDate"></new-exception-eform-total>
   </div>-->
-    <div v-show="echarts" style="width: 100%;height: 90%;">
-      <new-exception-echarts :condition="condition" :startdate="startDate" :groupname="groupname[0]"
-                             :enddate="endDate" :echarts="echarts"></new-exception-echarts>
-    </div>
   </div>
-  <div  class="flex" v-if="showdetail">
+  <div  class="basic-main" v-if="showdetail">
     <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
   </div>
 </template>

package/src/components/webmeter/newwebmeter/UserGasEchartsList.vue

@@ -1,13 +1,6 @@
 <template lang="html">
-  <div class="basic-main">
-    <div style="height: 40px;width: 100%;" v-show="echarts">
-      <div style="display: inline-block;">
-        <button @click="$parent.showEcharts()" class="button_clear button_spacing">隐藏图表</button>
-      </div>
-    </div>
-    <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
-      <div id="userhandplan" style=" height: 600px;width: 1000px;padding: 1% 1%;min-width:98%;min-height: 98%"></div>
-    </div>
+  <div>
+    <div id="userhandplan" style=" height: 98%;width: 98%;padding: 1% 1%;"></div>
   </div>
 </template>
 
@@ -83,7 +76,7 @@
           'color': '#384757',
           'tooltip': {
             'trigger': 'axis',
-            'extraCssText': 'height: auto;'
+            'extraCssText': 'width: auto;height: auto;'
           },
           'legend': {
             'data': [

package/src/components/webmeter/newwebmeter/UserGasList.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="flex-row" v-show="!echarts">
-    <div id='app' class="basic-main">
+  <div class="flex-row">
+    <div id='app' class="basic-main" v-show="!echarts">
       <criteria-paged :model="model" :pager='true' v-ref:paged>
         <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -40,7 +40,6 @@
                               :field="$parent.$parent.getfield"
                               sqlurl="rs/logic/exportfile" sql-name="webmeter_getNewHandChanceList" template-name='抄表分析'
                               :choose-col="true"></export-excel>
-                <button class="button_export button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
                 <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>
@@ -200,15 +199,14 @@
         </data-grid>
       </criteria-paged>
     </div>
-<!--    <div style="height: 40px;width: 100%;" v-show="echarts">-->
-<!--      <button class="button_search button_spacing" @click="showEcharts()">隐藏图表</button>-->
-<!--    </div>-->
-
-  </div>
-  <!--图显示模板-->
-  <div class="flex-row" v-show="echarts" style="width: 100%;height: 90%;">
-    <user-gas-echarts-list :condition="condition" :startdate="startDate"
-                           :enddate="endDate" :echarts="echarts"></user-gas-echarts-list>
+    <div style="height: 40px;width: 100%;" v-show="echarts">
+      <button class="button_search button_spacing" @click="showEcharts()">隐藏图表</button>
+    </div>
+    <!--图显示模板-->
+    <div class="span " v-show="echarts" style="width: 100%;height: 90%;">
+      <user-gas-echarts-list :condition="condition" :startdate="startDate"
+                             :enddate="endDate" :echarts="echarts"></user-gas-echarts-list>
+    </div>
   </div>
 </template>
 <script>

package/src/components/webmeter/newwebmeter/UserInstructList.vue

@@ -38,7 +38,7 @@
                                   :field="$parent.$parent.getfield"
                                   sqlurl="rs/logic/exportfile" sql-name="webmeter_getNewInstructChanceList" template-name='指令分析'
                                   :choose-col="true"></export-excel>
-                    <button @click="$parent.$parent.showEcharts()" class="button_export button_spacing">显示图表</button>
+<!--                    <button @click="$parent.$parent.showEcharts()" class="button_export button_spacing">显示图表</button>-->
                     <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>

package/src/components/webmeter/newwebmeter/signAnalysisEcharts.vue

@@ -1,23 +1,15 @@
 <template lang="html">
-  <div class="basic-main" style="height: 98%;">
-    <div class="row" style="height: 40px;width: 100%;" v-show="echarts">
-      <div class="col-sm-2" style="display: inline-block;">
-        <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
-      </div>
-      <!--图显示模板-->
-      <div class="row col-sm-3 mystyle" style="display: inline-block;">
-        <label class="font_normal_body">图表统计项</label>
-        <v-select :options='$parent.getgroupname' :value.sync="groupname"
-                  close-on-select
-                  id="groupname"
-                  placeholder='分组项'
-                  v-model="groupname"
-                  value-single="true"></v-select>
-      </div>
-    </div>
-    <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
-      <div id="signInfo"></div>
-    </div>
+  <div class="mystyle" style="display: inline-block;">
+    <label class="font_normal_body">图表统计项</label>
+  <v-select style="width:60%" id="groupname" v-model="groupname"
+            placeholder='分组项'
+            value-single="true"
+            :value.sync="groupname"
+            :options='getgroupname'
+            close-on-select></v-select>
+  </div>
+  <div>
+    <div id="signInfo"></div>
   </div>
 </template>
 
@@ -55,12 +47,12 @@
   }
 
   function selectArray(res, str) {
-    let j = 0;
-    let sum = 0;
-    let data = []
+    var j = 0;
+    var sum = 0;
+    var data = []
     //上一轮是否在data中添加成功
-    let mark = false
-    for (let i = 0; i < res.length; i++) {
+    var mark = false
+    for (var i = 0; i < res.length; i++) {
       if (i != 0) {
         if (res[i].f_parameter_date == res[i - 1].f_parameter_date) {
           if (res[i].f_parameter_name == str) {
@@ -167,8 +159,8 @@
         } else {
           name = '日'
         }
-        let series = [];
-        for (let i = 0; i < gettip.length; i++) {
+        var series = [];
+        for (var i = 0; i < gettip.length; i++) {
           series.push({
             name: gettip[i],
             type: 'bar',

package/src/components/webmeter/newwebmeter/signAnalysisEform.vue

@@ -1,5 +1,5 @@
 <template lang="html">
-  <div class="basic-main" style="height: 98%;">
+  <div class="span" >
     <div class="mystyle2 ">
       <label class="control-label">汇总项</label>
       <input type="checkbox" id="year" value="year"  v-model="nameForSql"/>

package/src/components/webmeter/newwebmeter/signAnalysisListMain.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id='app' class="basic-main" style="height: 98%;" v-show="(!echarts)&&(!isActiveTotalForm)">
+  <div id='app' class="basic-main" v-show="(!echarts)&&(!isActiveTotalForm)">
     <criteria-paged :model="model" :pager='true' v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -37,7 +37,7 @@
                               :field="$parent.$parent.getfield"
                               sqlurl="rs/logic/exportfile" sql-name="selectSignAnalysisList" template-name='标记分析'
                               :choose-col="true"></export-excel>
-                  <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+<!--                  <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
                   <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showEform()">显示汇总</button>
                 <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>
@@ -161,15 +161,15 @@
       </data-grid>
     </criteria-paged>
   </div>
-<!--  <div style="height: 40px;width: 100%;" v-show="echarts">-->
-<!--&lt;!&ndash;    <div style="display: inline-block;">&ndash;&gt;-->
-<!--&lt;!&ndash;      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>&ndash;&gt;-->
-<!--&lt;!&ndash;    </div>&ndash;&gt;-->
-<!--    &lt;!&ndash;      图显示模板&ndash;&gt;-->
+  <div style="height: 40px;width: 100%;" v-show="echarts">
+    <div style="display: inline-block;">
+      <button class="button_search button_spacing" @click="notShowEcharts()">隐藏图表</button>
+    </div>
+    <!--      图显示模板-->
 
-<!--  </div>-->
-  <div style="width: 100%;height: 100%;" v-show="echarts">
-    <sign-analysis-echarts  :condition="condition" :startdate="startDate" :groupname="groupname[0]"
+  </div>
+  <div style="width: 100%;height: 90%;" v-show="echarts">
+    <sign-analysis-echarts  :condition="condition" :startdate="startDate"
                            :enddate="endDate" :echarts="echarts"></sign-analysis-echarts>
   </div>
 <!--  <div style="height: 40px;width: 100%;" v-show="isActiveTotalForm">-->
@@ -187,7 +187,7 @@
 <!--              close-on-select></v-select>-->
 <!--  </div>-->
 <!--</div>-->
-  <div style="width: 100%;height: 100%;" v-show="isActiveTotalForm">
+  <div style="width: 100%;height: 90%;" v-show="isActiveTotalForm">
     <sign-analysis-eform :signtype="signtype[0]" :condition="condition"></sign-analysis-eform>
   </div>
 </template>
@@ -205,12 +205,11 @@
     data() {
       return {
         model: new PagedList('rs/sql/selectSignAnalysisList', 20),
-        groupname: ['year'],
-        getgroupname: [
+        groupNameByDate: [],
+        getGroupNameByDate: [
           {label: '年份', value: 'year'},
           {label: '月份', value: 'month'},
-          {label: '周', value: 'week'},
-          {label: '天', value: 'day'}
+          {label: '周', value: 'week'}
         ],
         orgid:[this.$login.f.orgid],
         criteriaShow:false,

package/src/components/webmeter/report/ReportList.vue

@@ -204,7 +204,7 @@
           </footer>
         </modal>
       </div>
-      <div  class="flex" v-if="show">
+      <div  class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/filiale/WEINAN/MeterQuery.vue

@@ -454,7 +454,7 @@
           <!--</footer>-->
           <!--</modal>-->
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div>

package/src/filiale/WEINAN/RecordInfoQuery.vue

@@ -640,7 +640,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>

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

@@ -353,7 +353,7 @@
         <!--</footer>-->
         <!--</modal>-->
       </div>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/filiale/gongyi/sale/businessquery/BusinessManage.vue

@@ -2,62 +2,62 @@
   <!--  <div v-if="listpage">-->
   <tab-button v-ref:list :active="-1">
     <tabs header="收费查询" v-if="permission('收费查询')">
-      <charge-query v-if="show.includes('收费查询')" @deal-msg="dealMsg" :data="data"></charge-query>
+      <charge-query v-if="show == '收费查询'" @deal-msg="dealMsg" :data="data"></charge-query>
     </tabs>
     <tabs header="其他收费查询" v-if="permission('其他收费查询')">
-      <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
+      <other-charge-query v-if="show == '其他收费查询'" @deal-msg="dealMsg" :data="data"></other-charge-query>
     </tabs>
     <tabs header="换表查询" v-if="permission('换表查询')">
-      <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
+      <change-meter-query v-if="show == '换表查询'" @deal-msg="dealMsg" :data="data"></change-meter-query>
     </tabs>
     <tabs header="补卡查询" v-if="permission('补卡查询')">
-      <fill-card-query v-if="show.includes('补卡查询')" @deal-msg="dealMsg" :data="data"></fill-card-query>
+      <fill-card-query v-if="show == '补卡查询'" @deal-msg="dealMsg" :data="data"></fill-card-query>
     </tabs>
     <tabs header="抄表信息查询" v-if="permission('机表抄表查询')">
-      <handplan-query v-if="show.includes('抄表信息查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
+      <handplan-query v-if="show == '抄表信息查询'" @deal-msg="dealMsg" :data="data"></handplan-query>
     </tabs>
     <tabs header="过户查询" v-if="permission('过户查询')">
-      <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
+      <transfer-query v-if="show == '过户查询'" @deal-msg="dealMsg" :data="data"></transfer-query>
     </tabs>
     <tabs header="冲正查询" v-if="permission('冲正查询')">
-      <reverse-query v-if="show.includes('冲正查询')" @deal-msg="dealMsg" :data="data"></reverse-query>
+      <reverse-query v-if="show == '冲正查询'" @deal-msg="dealMsg" :data="data"></reverse-query>
     </tabs>
 
     <tabs header="补气查询" v-if="permission('补气查询')">
-      <fill-gas-query v-if="show.includes('补气查询')" @deal-msg="dealMsg" :data="data"></fill-gas-query>
+      <fill-gas-query v-if="show == '补气查询'" @deal-msg="dealMsg" :data="data"></fill-gas-query>
     </tabs>
     <tabs header="启用查询" v-if="permission('启用查询')">
-      <enable-query v-if="show.includes('启用查询')" @deal-msg="dealMsg" :data="data"></enable-query>
+      <enable-query v-if="show == '启用查询'" @deal-msg="dealMsg" :data="data"></enable-query>
     </tabs>
     <tabs header="停用查询" v-if="permission('停用查询')">
-      <disable-query v-if="show.includes('停用查询')" @deal-msg="dealMsg" :data="data"></disable-query>
+      <disable-query v-if="show == '停用查询'" @deal-msg="dealMsg" :data="data"></disable-query>
     </tabs>
     <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">
-      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>
+      <over-due-query v-if="show == '减免优惠查询'" @deal-msg="dealMsg" :data="data"></over-due-query>
     </tabs>
     <tabs header="调价补差查询" v-if="permission('调价补差查询')">
-      <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
+      <priceadjust-query v-if="show == '调价补差查询'" @deal-msg="dealMsg" :data="data"></priceadjust-query>
     </tabs>
     <tabs header="迁表查询" v-if="permission('迁表查询')">
-      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
+      <movemeter-query v-if="show == '迁表查询'" @deal-msg="dealMsg" :data="data"></movemeter-query>
     </tabs>
     <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">
-      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>
+      <card-handplan-query v-if="show == '卡表抄表查询'" @deal-msg="dealMsg" :data="data"></card-handplan-query>
     </tabs>
     <tabs header="收据查询" v-if="permission('收据查询')">
-        <meter-receipt-query v-if="show.includes('收据查询')" @deal-msg="dealMsg" :data="data"></meter-receipt-query>
+        <meter-receipt-query v-if="show == '收据查询'" @deal-msg="dealMsg" :data="data"></meter-receipt-query>
     </tabs>
     <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
     <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
     <!--      </tabs>-->
     <tabs header="业务查询" v-if="permission('业务查询')">
-      <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
+      <busines-query v-if="show == '业务查询'" @deal-msg="dealMsg" :data="data"></busines-query>
     </tabs>
     <tabs header="预存查询" v-if="permission('预存查询')">
-      <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
+      <yucun-detailss v-if="show == '预存查询'" @deal-msg="dealMsg" :data="data"></yucun-detailss>
     </tabs>
     <tabs header="用户余额分析" v-if="permission('用户余额分析')">
-      <transfer-query v-if="show.includes('用户余额分析')" @deal-msg="dealMsg" :data="data"></transfer-query>
+      <transfer-query v-if="show == '用户余额分析'" @deal-msg="dealMsg" :data="data"></transfer-query>
     </tabs>
     <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
     <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
@@ -87,7 +87,7 @@ export default {
       },
       // searchNumber:'',
       rowData: {},
-      show: [],
+      show: '',
       data: {
         startDate: this.$login.toStandardDateString() + ' 00:00:00',
         endDate: this.$login.toStandardDateString() + ' 23:59:59',

package/src/filiale/gongyi/sale/businessquery/ChangeMeterQuery.vue

@@ -173,11 +173,6 @@
                             close-on-select clear-button>
                   </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_metertitles"
-                         condition="f_metertitles = '{}'" placeholder='表封号'>
-                </div>
               </div>
             </div>
           </criteria>
@@ -205,9 +200,6 @@
                 <th>
                   <nobr>新表号</nobr>
                 </th>
-                <th>
-                  <nobr>表封号</nobr>
-                </th>
                 <th>
                   <nobr>旧气表品牌</nobr>
                 </th>
@@ -278,9 +270,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_metertitles}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand_old}}</nobr>
               </td>

package/src/filiale/gongyi/sale/filesquery/UserQuery.vue

@@ -206,14 +206,6 @@
                                 condition="f_gas_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户等级</label>
-                    <v-select :value.sync="model.f_user_level"
-                              v-model="model.f_user_level" condition="f_user_level in {}"
-                              :options='$parent.$parent.userLevels' placeholder='请选择'
-                              multiple = "true"
-                              close-on-select></v-select>
-                  </div>
 
 
                 </div>
@@ -239,9 +231,6 @@
                   <th>
                     <nobr>账户余额</nobr>
                   </th>
-                  <th>
-                    <nobr>客户等级</nobr>
-                  </th>
                   <th>
                     <nobr>客户地址</nobr>
                   </th>
@@ -302,9 +291,6 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_balance}}</nobr>
                 </td>
-                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_user_level}}</nobr>
-                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
@@ -674,9 +660,6 @@
       },
       userstates() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
-      },
-      userLevels () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
       }
       // sliceArea() {
       //   let rs = new Array()

package/src/filiale/jingwei/RecordInfoQuery.vue

@@ -570,7 +570,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>

package/src/filiale/jingzhou/ChargeQuery.vue

@@ -301,7 +301,6 @@
                   <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>
@@ -342,7 +341,7 @@
                   <nobr>金额</nobr>
                 </th>
                 <th>
-                  <nobr>收款</nobr>
+                  <nobr>滞纳金</nobr>
                 </th>
                 <th>
                   <nobr>燃气费</nobr>
@@ -357,7 +356,7 @@
                   <nobr>上期结余</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>收款</nobr>
                 </th>
                 <!--<th>-->
                 <!--&lt;!&ndash;                  <nobr>所属年月</nobr>&ndash;&gt;-->
@@ -486,9 +485,6 @@
               <td style="text-align: center;"><nobr>
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </nobr> </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_residential_area}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_street}}</nobr>
               </td>
@@ -529,7 +525,7 @@
                 <nobr>{{row.fee}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_collection}}</nobr>
+                <nobr>{{row.f_delaypay}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_preamount}}</nobr>
@@ -545,7 +541,7 @@
                 <nobr v-else>{{row.f_balance}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_delaypay}}</nobr>
+                <nobr>{{row.f_collection}}</nobr>
               </td>
               <!--<td style="text-align: center;">-->
               <!--<nobr>{{row.f_rest_date}}</nobr>-->
@@ -787,13 +783,7 @@
 
         footer:[],
         config: {
-          defaultPrint: [
-            'f_residential_area', 'id', 'f_userinfo_code', 'f_user_name', 'f_address', 'f_user_type',
-            'f_gasproperties', 'f_pregas', 'fee', 'f_collection', 'f_balance',
-            'f_curbalance', 'f_type', 'f_payment', 'f_operate_date', 'f_operator',
-            'f_stairamount1', 'f_stair1price', 'f_stair2amount', 'f_stair2price',
-            'f_stair3amount', 'f_stair3price'
-          ]
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date']
         },
         //排序
         orderitem:'f_operate_date desc',

package/src/filiale/jingzhou/HandplanQuery.vue

@@ -633,7 +633,7 @@
         </footer>
       </modal>
     </div>
-    <div class="flex" v-if="show">
+    <div class="basic-main" v-if="show">
       <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">

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

@@ -1,22 +1,5 @@
 
 export default{
-  chargeConfig: {
-    'f_residential_area':'小区','id': '收费编号', 'f_userinfo_code': '客户编号','f_user_name':'客户名称','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':"抄表员"
-  },
-  chargeexportConfig: {
-    'f_residential_area':'小区','id': '收费编号', 'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address': '客户地址','f_user_type': '客户类型',
-    'f_gasproperties': '用气性质','f_pregas': '气量','fee': '金额','f_collection': '收款', 'f_balance': '上期结余',
-    'f_curbalance': '本期结余','f_type': '收费类型','f_payment': '付款方式','f_operate_date': '收费日期','f_operator': '操作员',
-    'f_stairamount1':"一阶气量",'f_stair1price':"一阶单价",'f_stair2amount': "二阶气量",'f_stair2price': "二阶单价",
-    'f_stair3amount':"三阶气量",'f_stair3price': "三阶单价"
-  },
   // 把打印需要默认选中的字段名放在config数组中
   userConfig: { 'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_user_phone': '客户电话',
     'f_idnumber': '身份证号','f_balance': '账户余额','f_address': '客户地址','f_residential_area': '小区',
@@ -79,12 +62,25 @@ export default{
     'f_used_content': '更改前','f_new_content': '更改后','f_operator': '操作人', 'f_operate_date': '操作日期',
     'f_depname': '部门','f_orgname': '公司'
   },
+  chargeConfig: {
+    'id': '收费编号', 'f_userinfo_code': '客户编号','f_user_name':'客户名称','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':"抄表员"
+  },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'
   },
   cardhandanalysisConfig: {
     'f_operate_date': '收费日期', 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meter_brand': '气表品牌', 'f_sell_price': '购气单价', 'f_pregas': '购气量', 'f_preamount': '购气金额', 'f_collection': '充值金额', 'f_surplus_fee': '调价补差', 'f_curbalance': '本期结余', 'f_payment': '付款方式', 'f_price': '单价', 'f_real_gas': '用气量', 'f_real_money': '用气金额', 'f_residual_volume': '余量', 'f_total_usegas_amount': '剩余金额'
   },
+  chargeexportConfig: {
+    'id': '收费编号','f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_type': '客户类型','f_gasproperties': '用气性质','f_pregas': '气量','fee': '金额', 'f_collection': '收款','f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式' , 'f_operate_date': '收费日期','f_operator': '操作员', 'f_stairamount1': '一阶气量', 'f_stair1price':'一阶单价', 'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair3amount': '三阶气量','f_stair3price': '三阶单价',
+  },
   reverseexportConfig: {
     'f_userinfo_code': '客户编号','f_user_name': '客户名称', 'f_address': '客户地址'
   },