manage-client 3.2.41 → 3.2.42-aode

package/src/{filiale/shaoguan/sale/businessquery/PaymentChangeQuery.vue → components/sale/report/aode/iot/ReportQuery.vue}

@@ -2,62 +2,57 @@
   <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>
+          <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>
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </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="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"
-                              condition="f_tdate >= '{}'">
+                              condition="f_hand_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body" >结束日期</label>
+                  <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"
-                              condition="f_tdate <= '{}'">
+                              condition="f_hand_date <= '{}'">
                   </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_userid = '{}' " 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="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 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>-->
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
 
-                  <export-excel :data="$parent.$parent.getCondition"
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="paymentChangeQuery" template-name='缴费变更记录'
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="getReportQuery" template-name='上报数据'
                                 :choose-col="true"></export-excel>
-<!--                  <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>-->
             </div>
           </criteria>
 
@@ -71,96 +66,81 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>用户地址</nobr>
+                  <nobr>本次抄表底数</nobr>
                 </th>
                 <th>
-                  <nobr>旧付款方式</nobr>
+                  <nobr>上次抄表底数</nobr>
                 </th>
                 <th>
-                  <nobr>付款方式</nobr>
+                  <nobr>表计剩余金额</nobr>
                 </th>
                 <th>
-                  <nobr>银行名</nobr>
+                  <nobr>表内剩余金额</nobr>
                 </th>
                 <th>
-                  <nobr>开户名称</nobr>
+                  <nobr>表号</nobr>
                 </th>
                 <th>
-                  <nobr>银行开户账号</nobr>
+                  <nobr>抄表日期</nobr>
                 </th>
                 <th>
-                  <nobr>新开户名称</nobr>
-                </th>
-                <th>
-                  <nobr>新银行名</nobr>
-                </th>
-                <th>
-                  <nobr>新银行开户账号</nobr>
-                </th>
-                <th>
-                  <nobr>备注</nobr>
-                </th>
-                <th>
-                  <nobr>部门</nobr>
+                  <nobr>上次抄表日期</nobr>
                 </th>
+
                 <th>
-                  <nobr>操作人</nobr>
+                  <nobr>组织名称</nobr>
                 </th>
                 <th>
-                  <nobr>操作日期</nobr>
+                  <nobr>部门名称</nobr>
                 </th>
+
               </tr>
             </template>
             <template partial='body'>
               <td style="text-align: center;">
-                <nobr>{{row.f_userid}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_username}}</nobr>
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_address}}</nobr>
+                <nobr>{{row.f_user_name}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_paymentold}}</nobr>
+                <nobr>{{row.f_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_payment}}</nobr>
+                <nobr>{{row.f_last_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_nbankname}}</nobr>
+                <nobr>{{row.f_jval}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_nusermc}}</nobr>
+                <nobr>{{row.f_meterBalanceAmt}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_nidofcard}}</nobr>
+                <nobr>{{row.f_meternumber}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_newnusermc}}</nobr>
+                <nobr>{{row.f_hand_date}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_newnbankname}}</nobr>
+                <nobr>{{row.f_last_hand_date}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_newnidofcard}}</nobr>
+                <nobr>{{row.f_orgname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_notnull}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_departments}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_toperator}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_tdate}}</nobr>
+                <nobr>{{row.f_depname}}</nobr>
               </td>
+
             </template>
             <template partial='foot'></template>
           </data-grid>
+
         </criteria-paged>
+
+
+      </div>
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div>
   </div>
@@ -168,87 +148,121 @@
 
 <script>
   import {PagedList} from 'vue-client'
-  import defaultPrint from '../../config/DefaultPrint'
-  import exportConfig from '../../config/exportConfig'
-  let readySomething = async function (self) {
+  import exportConfig from '../../../config/exportConfig'
+  import defaultPrint from "../../../config/DefaultPrint";
+  import plugin from "system-clients/src/plugins/GetLoginInfoService";
 
-    console.log("self.login",self.$login)
-    // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
-    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
-    self.$refs.paged.$refs.cri.model.startDate=self.data.startDate
-    self.$refs.paged.$refs.cri.model.endDate=self.data.endDate
-    self.search()
+  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.$refs.paged.$refs.cri.search()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    await self.$MagLoadParams.loadParam()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-    props:['data'],
-    title: '缴费变更',
+    title: '上报数据',
     data() {
       return {
+        org:[this.$login.f.orgid],
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
+        },
+        //f_price_name:[],
+        gasproperties:[],
+        showinfo: false,
         data: {},
-        other: [],
-        footer: [],
-        model: new PagedList('rs/sql/paymentChangeQuery', 20, {}),
-        criteriaShow: false,
-        orgCondtionStr: '',
         show:false,
         rowdata:{},
-        modelval: [],
-        fields: {},
-        config: {
-          defaultPrint: ['f_userid', 'f_username']
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
         },
-        thead: '',
-        showupload:false,
-        selected:{},
+        model: new PagedList('rs/sql/getReportQuery', 20, {}, ),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        // 下拉框
+        meterbrands: [],
+        pricenames: [],
+        prices: [],
+        //合计数据
+        defaultfield: [],
+        sumsmodel: {},
+        f_filialeid: this.$login.f.f_orgid,
+        selectfields:[]
       }
     },
+    props:['selectorg'],
     ready() {
-      // this.initres.dep.push(this.$login.f.depids)
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.reportConfig){
+        this.selectfields.push(item)
+      }
     },
     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]}`);
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.selectorgid = obj.resids
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
         }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
       },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
-      selfSearch(args) {
-        if (this.data) {
-          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+
+          console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
         }
-        args.condition = `${args.condition}` + this.orgCondtionStr
+      },
+
+      selfSearch(args) {
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+
+        // let f_orgstr = this.orgCondtionStr
+        // args.condition = `${args.condition} ` + f_orgstr + 'and f_orgid in ('+ this.f_orgid +')'
+        // 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] = []
         })
+
+      },
+      dealmsg(val) {
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
       },
       show() {
         this.criteriaShow = true
@@ -256,8 +270,9 @@
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      getRes(obj) {
-        this.orgCondtionStr = obj
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.f_orgid = obj.resids
       },
       stamp() {
         this.all = false
@@ -271,22 +286,12 @@
       put() {
         // 对Modelval进行排序
         this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>停用查询报表</th></tr><tr>`
+        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>'
       },
-      cancel() {
-        this.show = false
-      },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
       print() {
         this.$refs.print.PrintAsFile()
         this.printshow = false
@@ -305,34 +310,35 @@
         })
         this.modelval = sortModel
         console.log('选择的打印的字段', this.modelval)
-      }
-    },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
-        } else {
-          this.modelval = defaultPrint.config
-          this.put()
-        }
       },
-      sumsmodel: {
-        handler: function (val) {
-          this.getotherfooter();
-        },
-        deep: true
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
       },
-      'modelval.length'() {
-        this.put()
+    },
+    watch: {
+      'model'(val) {
+        console.log(val, "12222222222222222222")
       },
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+          this.f_filialeid = res[1]
+          this.updateParams()
+        }
+      }
     },
     computed: {
+
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.paymentChangeQuery
+        return exportConfig.reportConfig
       },
+
     }
   }
 </script>