manage-client 3.2.3 → 3.2.7

package/src/components/SellReport/ManageGasSumChange.vue

@@ -190,13 +190,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in( ' + this.f_depid.toString()+")"
+          orgcondition += ' and f_depid in (' + this.f_depid.toString() + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + this.$refs.paged.$refs.criteria.condition
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageGasSumChangeTwo.vue

@@ -195,13 +195,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
           orgcondition += ' and f_depid in( ' + this.f_depid.toString() + ")"
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + this.$refs.paged.$refs.criteria.condition
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageGasSumOtherCharge.vue

@@ -175,13 +175,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/MeterPrice.vue

@@ -175,13 +175,13 @@
           this.printTime = this.$login.toStandardTimeString()
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid = ' + this.f_orgid
+            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
           }
           if (this.f_depid[0]) {
-            orgcondition += ' and f_depid = ' + this.f_depid
+            orgcondition += ' and f_depid in (' + this.f_depid + ')'
           }
           if(this.f_operatorid[0]) {
-            orgcondition += ' and f_operatorid = ' + this.f_operatorid
+            orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
           }
           this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
           this.$refs.paged.search(args)

package/src/components/SellReport/MeterReader.vue

@@ -159,9 +159,9 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/NonResidentGas.vue

@@ -175,13 +175,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/OperatorSellReport.vue

@@ -175,7 +175,7 @@
           console.log( "condition:" + args.condition)
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid = ' + this.f_orgid
+            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
           }
           let deps = ''
           let i = 0

package/src/components/SellReport/OutletTable.vue

@@ -178,13 +178,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if (this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/PaymentDistribute.vue

@@ -160,7 +160,7 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/PaymentMethod.vue

@@ -181,7 +181,7 @@
           console.log("condition:" + args.condition)
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and s.f_orgid = ' + this.f_orgid
+            orgcondition += ' and s.f_orgid in (' + this.f_orgid + ')'
           }
           let  deps = ''
           let i = 0

package/src/components/SellReport/QTXManageBusSummary.vue

@@ -168,12 +168,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/SellDepReport.vue

@@ -186,13 +186,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/UserGasFillCard.vue

@@ -310,12 +310,12 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch(args) {
-        let orgcondition = ' s.f_orgid = ' + this.f_orgid
+        let orgcondition = ' s.f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
           orgcondition += " and s.f_depid in("+this.f_depid.toString()+')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and s.f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and s.f_operatorid in (' + this.f_operatorid + ')'
         }
         this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
         this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)

package/src/components/SellReport/UserSellingGas.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/WeiNanYuShou.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
-        if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+        if (this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/YuShouTable.vue

@@ -183,7 +183,7 @@
       },
       selfSearch (args) {
         let f_dep=this.f_depid
-        let orgcondition = ' ts.f_orgid = ' + this.f_orgid
+        let orgcondition = ' ts.f_orgid in (' + this.f_orgid + ')'
         if (f_dep[0]) {
           orgcondition += " and ts.f_depid in('"+f_dep[0]+"'"
             for( let i=1;i<f_dep.length;i++){

package/src/components/SellReport/chargeSchedule.vue

@@ -259,7 +259,7 @@
       },
       selfSearch(args) {
         let f_dep=this.f_depid
-        let orgcondition = ' ts.f_orgid = ' + this.f_orgid
+        let orgcondition = ' ts.f_orgid in (' + this.f_orgid + ')'
         if (f_dep[0]) {
           orgcondition += " and ts.f_depid in('"+f_dep[0]+"'"
           for( let i=1;i<f_dep.length;i++){
@@ -268,7 +268,7 @@
           orgcondition +=')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and ts.f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and ts.f_operatorid in (' + this.f_operatorid + ')'
         }
         this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
         this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)

package/src/components/SellReport/pengan/ManageBusPeng.vue

@@ -194,12 +194,12 @@
       selfSearch (args) {
         console.log('f_inputtor='+this.f_inputtor)
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'u.f_orgid = ' + this.f_orgid
+        let orgcondition = 'u.f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and u.f_depid = ' + this.f_depid
+          orgcondition += ' and u.f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and u.f_operatorid= ' + this.f_operatorid
+          orgcondition += ' and u.f_operatorid in (' + this.f_operatorid + ')'
         }
         if(this.$refs.paged.$refs.criteria.model.f_user_type!=''){
           orgcondition += ' and u.f_user_type = ' + `'${this.$refs.paged.$refs.criteria.model.f_user_type}'`

package/src/components/SellReport/userholds.vue

@@ -172,12 +172,12 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = ' u.f_orgid = ' + this.f_orgid
+      let orgcondition = ' u.f_orgid in (' + this.f_orgid + ')'
       if (this.f_depid[0]) {
-        orgcondition += ' and u.f_depid = ' + this.f_depid
+        orgcondition += ' and u.f_depid in (' + this.f_depid + ')'
       }
       if(this.f_operatorid[0]) {
-        orgcondition += ' and u.f_operatorid = ' + this.f_operatorid
+        orgcondition += ' and u.f_operatorid in (' + this.f_operatorid + ')'
       }
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)

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

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

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

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

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -37,12 +37,6 @@
                             v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
                     >
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input  style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
-                            v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
-                    >
-                  </div>
                   <div class="col-sm-4 form-group button-range">
                     <button @click="search()" class="button_search button_spacing">查询</button>
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
@@ -70,7 +64,12 @@
                     </v-select>
                   </div>-->
 <!--                  <res-select-group  :show-component="['company']" :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">表&emsp;&emsp;号</label>
+                    <input  style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
+                            v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
+                    >
+                  </div>
                   <div class="col-sm-2">
                     <label class="font_normal_body">公&emsp;&emsp;司</label>
                     <right-tree @re-res="$parent.$parent.getorg"

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

@@ -38,16 +38,6 @@
                        v-model="model.f_address"
                 >
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">表&ensp;&ensp;&ensp;&ensp;号</label>
-                <input
-                       class="input_search" condition="f_meternumber like '%{}%'"
-                       placeholder='表号'
-                       style="width:60%"
-                       type="text"
-                       v-model="model.f_meternumber">
-              </div>
-
 
               <div style="float:right">
                 <button @click="search()" class="button_search" v-el:cba>查询</button>
@@ -94,7 +84,15 @@
               <!--                            condition="f_gasproperties = '{}'"-->
               <!--                  ></v-select>-->
               <!--                </div>-->
-
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表&ensp;&ensp;&ensp;&ensp;号</label>
+                <input
+                  class="input_search" condition="f_meternumber like '%{}%'"
+                  placeholder='表号'
+                  style="width:60%"
+                  type="text"
+                  v-model="model.f_meternumber">
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">气表品牌</label>
                 <v-select