manage-client 3.2.59 → 3.2.63

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

@@ -0,0 +1,341 @@
+<template>
+  <div id="unit" class="flex-row" class="foot_tabset"  @keyup.enter="search">
+    <div class="basic-main">
+      <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 class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group ">
+                  <label class="font_normal_body">用户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="用户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="用户名称">
+                </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"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="privilegeQuery"
+                                template-name='免费送气操作记录'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              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">
+                <res-select-group
+                  :show-component="['company','department','operator']"
+                    :initres="$parent.$parent.initres"
+                    @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 ">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气地址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='用气地址'>
+                </div>
+
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
+            <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>
+              </tr>
+
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;"><nobr>
+                <span ><a>{{row.f_userinfo_code}}</a></span>
+              </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_privilege_gas}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_privilege_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              赠送方量合计:&emsp;{{sumsmodel.f_privilege_gas}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              赠送金额合计:&emsp;{{sumsmodel.f_privilege_money}}
+            </td>
+          </tr>
+        </table>
+
+      </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) {
+
+    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.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  }
+  export default {
+    title: '免费送气查询',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+          f_privilege_gas:0,
+          f_privilege_money:0
+        }),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        config: {
+          defaultPrint: ["f_userinfo_code", "f_user_name", "f_last_balance", "f_charge_money", "f_pre_deduct_money", "f_balance"]
+        },
+        //默认打印列
+        defaultfield: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        thead: '',
+        tfoot: '',
+
+
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      readySomething(this)
+    },
+    methods: {
+      getotherfooter(){
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self =this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+
+
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        console.log(obj,"========")
+        this.orgCondtionStr = obj
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>换表查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    computed: {
+      getCondition() {
+          return {
+            startDate: this.$refs.paged.$refs.cri.model.startDate,
+            endDate: this.$refs.paged.$refs.cri.model.endDate,
+            condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        return exportConfig.PrivilegeQuery
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      }
+    }
+  }
+</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('气价类型')]
       },