manage-client 3.2.16 → 3.2.20

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

@@ -88,7 +88,14 @@
                             condition="ts.f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
-
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options="$parent.$parent.meterbrands"
+                            condition="br.f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group" >
                   <label class="font_normal_body" >开始时间</label>
                   <datepicker style="width: 60%" placeholder="大于等于"
@@ -218,10 +225,11 @@
   import exportConfig from '../../sale/config/exportConfig'
   import plugins from '../../../plugins/GetLoginInfoService'
   import defaultPrint from "../../sale/config/DefaultPrint";
+  import * as Util from '../../../Util'
 
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
-    self.initParams()
+    // self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
@@ -231,8 +239,8 @@
         show:false,
         detail24: false,
         org:[this.$login.f.orgid],
-        orgcondition:' and f_filialeid = ' + this.$login.f.orgid,
-        f_filialeid: this.$login.f.f_orgid,
+        orgcondition: '',           //' and f_filialeid = ' + this.$login.f.orgid,
+        //f_filialeid: this.$login.f.f_orgid,
         detaillist: [],
         prices: [],
         gasproperties:[],
@@ -252,25 +260,28 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
+      this.$refs.paged.$refs.criteria.model.f_start_date = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_end_date = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      initParams() {
-        // 初始化气表品牌
-        let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
-          temp.value = item.value.f_meter_brand
-          brandArr.push(temp)
-        })
-        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-        //初始化气表价格
-        this.prices = this.$MagGetSaleParam.getPrices();
-      },
-      async updateParams() {
-        await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.initParams()
-      },
+      // initParams() {
+      //   // 初始化气表品牌
+      //   let brandArr = []
+      //   this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+      //     let temp = {}
+      //     temp.label = item.label
+      //     temp.value = item.value.f_meter_brand
+      //     brandArr.push(temp)
+      //   })
+      //   this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      //   //初始化气表价格
+      //   this.prices = this.$MagGetSaleParam.getPrices();
+      // },
+      // async updateParams() {
+      //   await this.$MagLoadParams.loadParam(this.f_filialeid)
+      //   this.initParams()
+      // },
       getorg(obj) {
         if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
           this.orgcondition = " and m.f_orgid  in " + plugins.convertToIn(obj)
@@ -344,7 +355,7 @@
         console.log('正则提取:',res && res[1])
         if (res) {
           this.f_filialeid = res[1]
-          this.updateParams()
+          // this.updateParams()
         }
       }
     },
@@ -392,6 +403,9 @@
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
+      meterbrands() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表品牌')]
+      },
       getCondition () {
         var con = ""
         if (this.orgCondtionStr) {

package/src/filiale/WEINAN/EchartsBox.vue

@@ -1,110 +1,110 @@
-<template lang="html">
-  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
-    <div class="form-horizontal select-overspread container-fluid auto">
-      <div class="row">
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="startDate">开始日期:</label>
-          <datepicker id="startDate" placeholder="开始日期"
-                      style="width:60%"
-                      v-model="model.startDate"
-                      :value.sync="model.startDate"
-                      :disabled-days-of-Week="[]"
-                      class="datepicker"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="endDate">结束日期:</label>
-          <datepicker id="endDate" placeholder="结束日期"
-                      style="width:60%"
-                      class="datepicker"
-                      v-model="model.endDate"
-                      :value.sync="model.endDate"
-                      :disabled-days-of-Week="[]"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="endDate">使用公司:</label>
-          <res-select restype='organization'
-                      @res-select="getRes"
-                      :initresid="model.id">
-          </res-select>
-        </div>
-      </div>
-    </div>
-    <div style="height: 97%;">
-      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
-        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
-          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
-                        v-ref:pay></site-manager>
-        </div>
-        <div style="flex: 1;width: 50%">
-          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
-                        v-ref:pay></bank-manager>
-        </div>
-      </div>
-      <div class="flex-row" style="flex: 1;height: 48%">
-
-        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
-          <div  style="flex: 1;">
-            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
-          </div>
-          <!--          <div style="flex: 1;">-->
-          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
-          <!--          </div>-->
-        </div>
-
-        <div style="flex: 1;width: 50%">
-          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-  import * as Util from '../../Util'
-
-  export default {
-    props: {
-      classname: {
-        type: String,
-        default: 'basic-main'
-      },
-      width: {
-        type: String,
-        default: '98.5%'
-      },
-      height: {
-        type: String,
-        default: '98%'
-      }
-    },
-    data() {
-      return {
-        jurisdiction: this.$login.r,
-        model: {
-          id: [this.$login.f.orgid],
-          orgid: [this.$login.f.orgid],
-          startDate: Util.toStandardDateString(),
-          endDate: Util.toStandardDateString()
-        }
-      }
-    },
-    methods: {
-      searchdata() {
-        this.$refs.pay.searchdata()
-      },
-      getRes(obj) {
-        this.model.orgid = obj
-      },
-    }
-  }
-</script>
-
-<style lang="css">
-</style>
+<template lang="html">
+  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
+    <div class="form-horizontal select-overspread container-fluid auto">
+      <div class="row">
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="startDate">开始日期:</label>
+          <datepicker id="startDate" placeholder="开始日期"
+                      style="width:60%"
+                      v-model="model.startDate"
+                      :value.sync="model.startDate"
+                      :disabled-days-of-Week="[]"
+                      class="datepicker"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">结束日期:</label>
+          <datepicker id="endDate" placeholder="结束日期"
+                      style="width:60%"
+                      class="datepicker"
+                      v-model="model.endDate"
+                      :value.sync="model.endDate"
+                      :disabled-days-of-Week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">使用公司:</label>
+          <res-select restype='organization'
+                      @res-select="getRes"
+                      :initresid="model.id">
+          </res-select>
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;">
+      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
+        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></site-manager>
+        </div>
+        <div style="flex: 1;width: 50%">
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></bank-manager>
+        </div>
+      </div>
+      <div class="flex-row" style="flex: 1;height: 48%">
+
+        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
+          <div  style="flex: 1;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
+          </div>
+          <!--          <div style="flex: 1;">-->
+          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
+          <!--          </div>-->
+        </div>
+
+        <div style="flex: 1;width: 50%">
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import * as Util from '../../Util'
+
+  export default {
+    props: {
+      classname: {
+        type: String,
+        default: 'basic-main'
+      },
+      width: {
+        type: String,
+        default: '98.5%'
+      },
+      height: {
+        type: String,
+        default: '98%'
+      }
+    },
+    data() {
+      return {
+        jurisdiction: this.$login.r,
+        model: {
+          id: [this.$login.f.orgid],
+          orgid: [this.$login.f.orgid],
+          startDate: Util.toStandardDateString(),
+          endDate: Util.toStandardDateString()
+        }
+      }
+    },
+    methods: {
+      searchdata() {
+        this.$refs.pay.searchdata()
+      },
+      getRes(obj) {
+        this.model.orgid = obj
+      },
+    }
+  }
+</script>
+
+<style lang="css">
+</style>