manage-client 3.3.84-wn → 3.3.84

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -57,7 +57,7 @@
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"
                               :field="$parent.$parent.getfield"
-                              titletable="用户查询" :starthead="$parent.$parent.startDate"
+                              titletable="营收汇总报表" :starthead="$parent.$parent.startDate"
                               :defaultfield="$parent.$parent.defaultfield"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
                   <div
@@ -244,7 +244,7 @@
             </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.toFixed(2) }}元
+              卡表购气金额:&emsp;{{ sumsmodel.f_card_money.toFixed(2) }}元
             </td>
             <td
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
@@ -297,6 +297,7 @@ export default {
       }, {
         f_collection: 0,
         f_gas: 0,
+        f_card_money:0,
         f_money: 0
       }),
       gasproperties: [],
@@ -408,13 +409,13 @@ export default {
             startDate: 'this.model.startDate',
             endDate: 'this.model.endDate',
             condition2: 'this.model.condition2'
-          }, {f_collection: 0, f_gas: 0, f_money: 0})
+          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_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})
+          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,})
         }
       }
     },
@@ -426,13 +427,13 @@ export default {
             startDate: 'this.model.startDate',
             endDate: 'this.model.endDate',
             condition2: 'this.model.condition2'
-          }, {f_collection: 0, f_gas: 0, f_money: 0})
+          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_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})
+          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,})
         }
       }
     },

package/src/filiale/WEINAN/UserGasAll.vue

@@ -70,11 +70,12 @@
                             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"
-                                :initresid='$parent.$parent.orgid'></right-tree>
-                  </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>-->
 <!--                    <res-select :initresid="$parent.$parent.orgid"-->
@@ -400,9 +401,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         reportStr: null,
         show: false,
         initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
+          org: [this.$login.f.orgid],
+          slice_area: [],
         },
         outlets: [],
         operator: [],
@@ -447,8 +447,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
           {label: '周', value: 'week'},
           {label: '日', value: 'day'}
         ],
-        // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
-        orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        // orgConditionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
+        orgConditionStr: '',
         orgid:[this.$login.f.orgid],
         usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
       }
@@ -554,11 +554,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.endDate1 == '' || this.startDate1 == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
-        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
-        if (this.orgCondtionStr)
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
-        else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgConditionStr}`
+        if (!this.orgConditionStr) {
+          this.condition = this.$refs.paged.$refs.cri.condition + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          this.condition = this.$refs.paged.$refs.cri.condition + this.orgConditionStr
+        }
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -584,11 +585,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       close() {
         this.show = false
       },
-      getRes(obj) {
-        this.orgCondtionStr = plugins.convertToIn(obj)
+      getRes (obj) {
+        this.orgConditionStr = obj
       },
       getorg(obj) {
-        this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
+        this.orgConditionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
       },
       getCondition () {
         return {
@@ -598,7 +599,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         }
       }
       // getRes(condition,obj) {
-      //   this.orgCondtionStr = condition
+      //   this.orgConditionStr = condition
       //   this.orgname = obj.orgnames[0]
       //   this.depname = obj.depnames[0]
       // }

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

@@ -839,7 +839,7 @@ monthGasConfig: {
     'f_company_name': '单位名称',
     'f_pregas': '购气（充值）数量',
     'f_stairamount1': '一阶气量',
-    'f_collection': '实收款',
+    'f_collection': '实收款'
   },
   manageChargeSummaryByAreaConfig: {
     'f_residential_area': '小区名称',
@@ -853,7 +853,9 @@ monthGasConfig: {
     'id': '单位编号',
     'f_company_name': '单位名称',
     'f_oughtamount': '期间用气量',
+    'f_oughtfee': '期间用气金额',
     'f_pregas': '期间售气量',
+    'f_collection': '期间售气金额',
     'f_table_num': '表具数量'
   }
 }