manage-client 3.2.80 → 3.2.83-1

package/src/components/sale/businessquery/handplan-info.vue

@@ -0,0 +1,405 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <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="aaa" placeholder="开始日期" style="width:60%"
+                              v-model="model.accountingStartDate"
+                              :value.sync="model.accountingStartDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true"
+                              condition="f_accounting_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">财务月度</label>
+                  <datepicker id="aaa" placeholder="结束日期" style="width:60%"
+                              v-model="model.accountingEndDate"
+                              :value.sync="model.accountingEndDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true"
+                              condition="f_accounting_date <= '{}'">
+
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">自然月度</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.handStartDate"
+                              :value.sync="model.handStartDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true"
+                              condition="f_hand_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">自然月度</label>
+                  <datepicker id="startDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.handEndDate"
+                              :value.sync="model.handEndDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true"
+                              condition="f_hand_date <= '{}'">
+                  </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"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="HandPlanCollection"
+                                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="f_gasproperties"class="font_normal_body">用气性质</label>
+                  <v-select id="f_gasproperties"
+                            style="width:60%"
+                            v-model="model.f_gasproperties"
+                            placeholder='用气性质'
+                            :value.sync="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties'
+                            condition="f_gasproperties = '{}'"
+                            close-on-select >
+                  </v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th rowspan="2">
+                  <nobr>用户号</nobr>
+                </th>
+                <th rowspan="2">
+                  <nobr>小区</nobr>
+                </th>
+                <th rowspan="2">
+                  <nobr>地址</nobr>
+                </th>
+                <th rowspan="2">
+                  <nobr>用户名</nobr>
+                </th>
+                <th rowspan="2">
+                  <nobr>表钢号</nobr>
+                </th>
+                <th rowspan="2">
+                  <nobr>客户类型</nobr>
+                </th>
+                <th rowspan="2">
+                  <nobr>用气性质</nobr>
+                </th>
+                <th colspan="12">
+                  <nobr>月份</nobr>
+                </th>
+              </tr>
+              <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>
+                <th>
+                  <nobr>十一月</nobr>
+                </th>
+                <th>
+                  <nobr>十二月</nobr>
+                </th>
+              </tr>
+
+
+
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{row.f_userinfo_code}}</td>
+              <td style="text-align: center;">{{row.f_residential_area}}</td>
+              <td style="text-align: center;">{{row.f_address}}</td>
+              <th style="text-align: center;">{{row.f_user_name}}</th>
+              <th style="text-align: center;">{{row.f_meternumber}}</th>
+              <th style="text-align: center;">{{row.f_user_type}}</th>
+              <th style="text-align: center;">{{row.f_gasproperties}}</th>
+              <th style="text-align: center;">{{row.f_month1}}</th>
+              <th style="text-align: center;">{{row.f_month2}}</th>
+              <th style="text-align: center;">{{row.f_month3}}</th>
+              <th style="text-align: center;">{{row.f_month4}}</th>
+              <th style="text-align: center;">{{row.f_month5}}</th>
+              <th style="text-align: center;">{{row.f_month6}}</th>
+              <th style="text-align: center;">{{row.f_month7}}</th>
+              <th style="text-align: center;">{{row.f_month8}}</th>
+              <th style="text-align: center;">{{row.f_month9}}</th>
+              <th style="text-align: center;">{{row.f_month10}}</th>
+              <th style="text-align: center;">{{row.f_month11}}</th>
+              <th style="text-align: center;">{{row.f_month12}}</th>
+            </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) {
+    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'
+    // await self.$refs.paged.$refs.cri.search()
+    // await self.$getConfig(self, 'SellingHand')
+    // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+
+    await self.$MagLoadParams.loadParam()
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+    console.log('self.sumsmodel', self.sumsmodel)
+  }
+
+
+  export default {
+    title: '抄表情况记录',
+    data() {
+      return {
+        rows: null,
+        other: [],
+        footer: [],
+        criteriaShow: false,
+        model: new PagedList('rs/sql/HandPlanCollection', 50,
+          {startDate: 'this.model.startDate', endDate: 'this.model.endDate'},
+          {
+            f_month1:0,
+            f_month2:0,
+            f_month3:0,
+            f_month4:0,
+            f_month5:0,
+            f_month6:0,
+            f_month7:0,
+            f_month8:0,
+            f_month9:0,
+            f_month10:0,
+            f_month11:0,
+            f_month12:0
+
+          }),
+        orgCondtionStr: '',
+
+        getfield: '',
+        show:false,
+        rowdata:{},
+        // config: {
+        //   defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_last_balance', 'f_balance']
+        // },
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        defaultfield: [],
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      getotherfooter() {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        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) {
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      getRes(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()
+      },
+      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() {
+        let result = {
+          condition: this.$refs.paged.$refs.cri.condition + this.orgCondtionStr,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
+        }
+        return result
+      },
+      getfield() {
+        return exportConfig.handplanInfoConfig
+      },
+      gasproperties() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
+      // payment() {
+      //   return [...this.$appdata.getParam('付款方式查询')]
+      // }
+    }
+  }
+</script>
+<style media="screen">
+  .divtext {
+    min-width: 50px;
+    max-width: 200px;
+    border: 1px solid green;
+    display: inline-block;
+  }
+</style>

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

@@ -7,28 +7,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" 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>
-                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</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="overDueQuery" 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">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body" title="减免开始时间">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -59,7 +37,28 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                          condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
-               <div class="col-sm-2 form-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>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</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="overDueQuery" 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 :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>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                          condition="f_user_name like '%{}%'" placeholder="客户名称">
@@ -81,7 +80,9 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>客户编号</nobr>
+<!--                  <nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -90,7 +91,9 @@
                   <nobr>档案编号</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
+<!--                  <nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>上期底数</nobr>
@@ -99,7 +102,9 @@
                   <nobr>本期底数</nobr>
                 </th>
                 <th>
-                  <nobr>抄表日期</nobr>
+<!--                  <nobr>抄表日期</nobr>-->
+                  <data-order field="f_operate_date" name="抄表日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
                 <th>
                   <nobr>减免金额</nobr>
@@ -223,11 +228,13 @@
           dep:[],
           user:[],
         },
+        //排序
+        orderitem:'f_open_date desc',
         orderFields: {
-          f_address: 'no'
+          f_open_date: 'no'
         },
         orderDefault: "'f_open_date desc'",
-        model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: "'f_open_date desc'"},{
+        model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: this.orderitem?`${this.orderitem}`:"'f_open_date desc'"},{
           f_latefee_ought:0
         }),
         f_orgid: this.$login.f.orgid,
@@ -239,6 +246,7 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_latefee_ought', 'f_comments', 'f_operate_date', 'f_operator']
         },
+
         //默认打印列
         defaultfield: [],
         thead: '',
@@ -337,6 +345,7 @@
         val.model = this.model.model
         this.$dispatch('deal-msg', val)
       },
+
       stamp() {
         this.all = false
         //默认选择要打印的列
@@ -429,7 +438,8 @@
         con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`
       }
       return {
-        condition: con
+        condition: con,
+        orderitem: this.orderitem?`${this.orderitem}`: " f_open_date desc"
       }
     },
     getfield() {

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

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
-        <criteria-paged :model="model" v-ref:paged>
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
@@ -116,7 +116,9 @@
                   <nobr>补差编号</nobr>
                 </th>
                 <th>
-                  <nobr>客户编号</nobr>
+<!--                  <nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -125,7 +127,9 @@
                   <nobr>档案编号</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
+<!--                  <nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>气表品牌</nobr>
@@ -174,7 +178,9 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-                  <nobr>操作日期</nobr>
+<!--                  <nobr>操作日期</nobr>-->
+                  <data-order field="f_operate_date" name="操作日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
 
                 <th>
@@ -335,7 +341,12 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/surplusQuery', 20, {}, {
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        model: new PagedList('rs/sql/surplusQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {
           f_real_amount: 0,
           f_surplus_fee: 0
         }),
@@ -464,6 +475,24 @@
         this.orgCondtionStr = condition
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
       }
 
     },
@@ -486,7 +515,8 @@
         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}
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
       },
       getfield() {
         return exportConfig.surplusConfig