manage-client 3.2.60 → 3.2.64

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

@@ -1,168 +1,168 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <div class="flex" >
-
-        <criteria-paged :model="model" v-ref:paged>
-          <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 for="startDate" class="font_normal_body" >开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              >
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body" >结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                             >
-                  </datepicker>
-                </div>
-                <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"-->
-<!--                                :header="$parent.$parent.other"-->
-<!--                                sqlurl="rs/logic/exportfile" sql-name="salesgasclassification" template-name='销售量分类'-->
-<!--                                :choose-col="true"></export-excel>-->
-<!--                  &lt;!&ndash;                  <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>&ndash;&gt;-->
-<!--                </div>-->
-              </div>
-            </div>
-            </div>
-          </criteria>
-
-          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-            <template partial='head'>
-              <tr>
-                <th>
-                  <nobr>用气性质</nobr>
-                </th>
-                <th>
-                  <nobr>区域</nobr>
-                </th>
-                <th>
-                  <nobr>用户类型</nobr>
-                </th>
-                <th>
-                  <nobr>本月开户</nobr>
-                </th>
-                <th>
-                  <nobr>本年开户</nobr>
-                </th>
-                <th>
-                  <nobr>开工累计</nobr>
-                </th>
-                <th>
-                  <nobr>本月售气量</nobr>
-                </th>
-                <th>
-                  <nobr>本年售气量</nobr>
-                </th>
-                <th>
-                  <nobr>本月售气金额</nobr>
-                </th>
-                <th>
-                  <nobr>本年售气金额</nobr>
-                </th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gasproperties}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_residential_area}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_usertype}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.yuekaihu}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.niankaihu}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.kgleij}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_yuepregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_yuepreamount}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
-              </td>
-            </template>
-            <template partial='foot'></template>
-          </data-grid>
-        </criteria-paged>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../config/DefaultPrint'
-  import exportConfig from '../config/exportConfig'
-  let readySomething = async function (self) {
-
-    console.log("self.login",self.$login)
-    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.search()
-  }
-  export default {
-    title: '销售量分类',
-    data() {
-      return {
-        model: new PagedList('rs/sql/salesgasclassification', 20, {f_start_date: 'this.model.startDate', f_end_date: 'this.model.endDate'}),
-        orgCondtionStr: '',
-      }
-    },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch(args) {
-        debugger
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-      }
-    },
-    watch: {
-    },
-    computed: {
-      // getCondition() {
-      //   return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
-      // },
-      // getfield() {
-      //   return exportConfig.exemptquery
-      // },
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" >
+
+        <criteria-paged :model="model" v-ref:paged>
+          <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 for="startDate" class="font_normal_body" >开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body" >结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                             >
+                  </datepicker>
+                </div>
+                <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"-->
+<!--                                :header="$parent.$parent.other"-->
+<!--                                sqlurl="rs/logic/exportfile" sql-name="salesgasclassification" template-name='销售量分类'-->
+<!--                                :choose-col="true"></export-excel>-->
+<!--                  &lt;!&ndash;                  <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>&ndash;&gt;-->
+<!--                </div>-->
+              </div>
+            </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
+                <th>
+                  <nobr>区域</nobr>
+                </th>
+                <th>
+                  <nobr>用户类型</nobr>
+                </th>
+                <th>
+                  <nobr>本月开户</nobr>
+                </th>
+                <th>
+                  <nobr>本年开户</nobr>
+                </th>
+                <th>
+                  <nobr>开工累计</nobr>
+                </th>
+                <th>
+                  <nobr>本月售气量</nobr>
+                </th>
+                <th>
+                  <nobr>本年售气量</nobr>
+                </th>
+                <th>
+                  <nobr>本月售气金额</nobr>
+                </th>
+                <th>
+                  <nobr>本年售气金额</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_usertype}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.yuekaihu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.niankaihu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.kgleij}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yuepregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yuepreamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+  let readySomething = async function (self) {
+
+    console.log("self.login",self.$login)
+    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.search()
+  }
+  export default {
+    title: '销售量分类',
+    data() {
+      return {
+        model: new PagedList('rs/sql/salesgasclassification', 20, {f_start_date: 'this.model.startDate', f_end_date: 'this.model.endDate'}),
+        orgCondtionStr: '',
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        debugger
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+    },
+    computed: {
+      // getCondition() {
+      //   return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      // },
+      // getfield() {
+      //   return exportConfig.exemptquery
+      // },
+    }
+  }
+</script>

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

@@ -7,6 +7,30 @@
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
                 <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :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_price_name" v-model='model.f_price_name'
+                            :options='$parent.$parent.priceNames'
+                            condition="f_price_name = '{}'"  @change="$parent.$parent.selectPrice()"
+                            close-on-select style="width:60%"
+                            v-el:cc></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" >单&emsp;&emsp;价</label>
+                  <v-select :value.sync="model.f_price" v-model='model.f_price'
+                            :options='$parent.$parent.pricesAll'
+                            condition="detailvalue like '%{}%'"
+                            close-on-select style="width:60%"
+                            v-el:cc></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            @change="$parent.$parent.pricetypechanged"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
                 <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>
@@ -22,22 +46,6 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" :title="'参数名为：气价状态'">气价状态</label>
-                  <v-select :value.sync="model.f_state" v-model='model.f_state'
-                            :options='$parent.$parent.stateprice' placeholder='气价状态'
-                            condition="f_state = '{}'"
-                            close-on-select style="width:60%" :value-single="true"
-                            v-el:cc></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">是否启用</label>
-                  <v-select :value.sync="model.price_state" v-model='model.price_state'
-                            :options='$parent.$parent.pricestate' placeholder='是否启用'
-                            condition="price_state = '{}'"
-                            close-on-select style="width:60%" :value-single="true"
-                            v-el:cc></v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -54,12 +62,20 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气价类型</label>
-                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
-                            @change="$parent.$parent.pricetypechanged"
-                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
-                            close-on-select v-ref:type>
-                  </v-select>
+                  <label class="font_normal_body">是否启用</label>
+                  <v-select :value.sync="model.price_state" v-model='model.price_state'
+                            :options='$parent.$parent.pricestate'
+                            condition="price_state = '{}'"
+                            close-on-select style="width:60%" :value-single="true"
+                            v-el:cc></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" :title="'参数名为：气价状态'">气价状态</label>
+                  <v-select :value.sync="model.f_state" v-model='model.f_state'
+                            :options='$parent.$parent.stateprice' placeholder='气价状态'
+                            condition="f_state = '{}'"
+                            close-on-select style="width:60%" :value-single="true"
+                            v-el:cc></v-select>
                 </div>
               </div>
 
@@ -119,6 +135,7 @@
     self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$MagLoadParams.loadParam()
+    self.getPricenames()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -142,7 +159,7 @@
         thead: '',
         tfoot: '',
         defaultfield: [],
-        resshow:['company','department','operator'],
+        resshow:['company'],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -150,11 +167,13 @@
         },
         gasproperties1:[],
         f_filialeid: this.$login.f.orgid,
-        prices: [],
+        priceNames: [],
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber']
         },
         pricestate:[{label:'未启用',value:'未启用'},{label:'已启用',value:'已启用'}],
+        pricesSum:[],
+        pricesAll:[{label: '全部', value: ''}],
         //合计数据
         sumsmodel: {},
         stateprice: this.$appdata.getParam('气价状态') ? [{label: '全部',value: ''}, ...this.$appdata.getParam('气价状态')] : [],
@@ -168,6 +187,34 @@
       })
     },
     methods: {
+      getPricenames() {
+        this.priceNames = []
+        let priceArr = []
+        debugger
+        this.$MagGetSaleParam.prices.forEach((item) => {
+          console.log('111111111',item);
+          this.pricesSum.push(item)
+          let temp = {}
+          temp.label = item.f_price_name
+          temp.value = item.f_price_name
+          priceArr.push(temp)
+        })
+        this.priceNames  = [{label: '全部', value: ''}, ...priceArr]
+      },
+      selectPrice(){
+        this.pricesAll=[{label: '全部', value: ''}]
+        this.$refs.paged.$refs.cri.model.f_price=''
+        this.pricesSum.forEach((item)=>{
+          if(this.$refs.paged.$refs.cri.model.f_price_name==item.f_price_name){
+              item.detailprice.forEach((item)=>{
+                let temp={}
+                temp.label=item.f_price
+                temp.value=item.f_price
+                this.pricesAll.push(temp)
+              })
+          }
+        })
+      },
       pricetypechanged(){
         this.$refs.paged.$refs.cri.model.f_price_name = []
       },
@@ -286,39 +333,6 @@
       },
     },
     computed: {
-      getPricenames() {
-        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
-        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
-        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
-        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          let rs = []
-          let priceArr = []
-          if ( pricetype.length >0) {
-            let params = {
-              f_price_type: pricetype[0],
-              filter: this.f_filialeid,
-              prices: this.prices
-            }
-            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
-              let temp = {}
-              temp.label = item.label
-              temp.value = item.value.f_price_name
-              priceArr.push(temp)
-            })
-            if(priceArr.length == 0 ){
-              rs= [{label: '全部', value: ''}]
-            }else{
-              rs = [ ...priceArr]
-            }
-          }
-          if (rs.length === 0) {
-            console.log('rs读出来是空')
-            this.$refs.paged.$refs.cri.model.f_price_name = ''
-          }
-          return rs
-        }
-      },
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
@@ -326,9 +340,6 @@
         console.log('export',exportConfig.gasPriceConfig)
         return exportConfig.gasPriceConfig
       },
-      gasStates () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
-      },
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },