manage-client 3.1.56 → 3.1.60

package/src/components/SellReport/OperatorCheckoutTwo.vue

@@ -1,263 +1,263 @@
-<template>
-  <div class="basic-main"  style="height: 100%">
-  <criteria-paged :model="model" :pager='false' v-ref:paged>
-    <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <p class="bg-info text-center" style="padding: 8px;">操作员结账报表</p>
-      <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-        <div class="row">
-            <div class="col-sm-4" >
-              <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="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-4" >
-              <label  class="font_normal_body" for="endDate">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
-              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-          <div class="col-sm-4">
-            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-            <res-select restype='department'
-                        @res-select="$parent.$parent.getdep"
-                        :parentresid="$parent.$parent.depresid"
-                        :initresid='$parent.$parent.depid'>
-            </res-select>
-
-          </div>
-          <div class="col-sm-4">
-            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-            <res-select restype='user'
-                        @res-select="$parent.$parent.getuser"
-                        :parentresid="$parent.$parent.userresid"
-                        :initresid='$parent.$parent.operatorid'>
-            </res-select>
-          </div>
-        </div>
-          <div class="span" style = "float:right;">
-            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-             <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-             <report-excel id='gasprice'></report-excel>
-          </div>
-        </div>
-    </criteria>
-    <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-      <table class='tableprint' style="margin: 0px auto">
-        <thead>
-        <tr>
-          <th colspan='17' style="font-weight: normal; text-align: left;">
-            <h3 style="text-align: center">结账报表</h3>
-          </th>
-        </tr>
-        <tr>
-          <th colspan='17' style="font-weight: normal; text-align: center;">
-            开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-            结束时间：{{ model.model.endDate }}
-          </th>
-        </tr>
-        <tr>
-          <th colspan='17' style="font-weight: normal; text-align: center;">
-            <div>
-              <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-              <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
-            </div>
-          </th>
-        </tr>
-        </thead>
-        <tr>
-          <td colspan='17'>
-            {{{ model.data.substring(26,model.data.length-8) }}}
-          </td>
-        </tr>
-      </table>
-      {{{ $parent.reportStr}}}
-    </div>
-  </criteria-paged>
-  <modal :show.sync="show" v-ref:modal small backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <h4 class="modal-title">输入文件名称</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="form-group">
-        <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-      <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
-    </footer>
-  </modal>
-  </div>
-</template>
-
-<script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
-  let saveFile = function * (self) {
-    // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/manageSingleTable',
-      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-      {resolveMsg: null, rejectMsg: null})
-    if (count.data.length > 0) {
-      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-      return
-    }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
-    if (saveBack.data.status === 'succeed') {
-      self.show = false
-      self.filename = ''
-      // 后台保存完成，通知刷新
-      self.$dispatch('save-success', self.filename)
-    }
-  }
-  export default {
-    title: '结账报表',
-    props: ['data'],
-    data () {
-      return {
-        printTime: this.$login.toStandardTimeString(),
-        depresid: [],
-        userresid: [],
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id,
-        operatorid: [],
-        depid: [],
-        orgname: '',
-        depname: '',
-        qishiDate:'',
-        jieshuDate:'',
-        startDate:'',
-        endDate:'',
-        operatorname: '',
-        f_inputtor:[],
-        f_user_type:'',
-        orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/checkoutReportTwo',
-          {startDate: 'this.model.startDate',
-                  endDate: 'this.model.endDate',
-                  f_orgid: 'this.model.f_orgid',
-                  depname:'this.model.depname',
-                  operatorname:'this.model.operatorname',
-                  qishiDate:'this.model.startDate.substring(0,10)',
-                  jieshuDate:'this.model.endDate.substring(0,10)'
-          },
-        ),
-
-        reportStr: null,
-        show: false
-      }
-    },
-    ready () {
-      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-      this.$refs.paged.$refs.criteria.search()
-      console.log(this.$login.f)
-    },
-
-    methods: {
-
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = '1 = 1'
-        if (this.f_orgid[0]){
-          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
-        }
-        if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
-        }
-        if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
-        }
-        if(this.depname){
-          this.$refs.paged.$refs.criteria.model.depname = this.depname
-        }else{
-          this.$refs.paged.$refs.criteria.model.depname = '无'
-        }
-
-        if(this.operatorname){
-          this.$refs.paged.$refs.criteria.model.operatorname = this.operatorname
-        }else{
-          this.$refs.paged.$refs.criteria.model.operatorname = '无'
-        }
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
-        this.$refs.paged.search(args)
-      },
-      getRes (obj) {
-        this.orgname = obj.res[0]
-        this.depresid = obj.resids
-        this.f_orgid = obj.resids
-      },
-      getdep (obj, val) {
-        this.depname = val[0]
-        this.userresid = obj
-        this.f_depid = obj
-      },
-      getuser ( obj, val) {
-        this.operatorname = val[0]
-        this.f_operatorid = obj
-      },
-      // 根据文件路径获取储存的报表内容
-      getFileContent (path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          this.reportStr = res.data.filecontent
-          this.model.state = '正确'
-        })
-      },
-      confirm () {
-        if (!this.filename || this.filename === '') {
-          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-        }
-        let saveGen = saveFile(this)
-        co(saveGen)
-      },
-      close () {
-        this.show = false
-      },
-      // 将报表保存成文件
-      confirmReport () {
-        this.show = true
-        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-      },
-    },
-    watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
-      }
-    },
-    computed: {
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      }
-    }
-  }
-</script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-</style>
+<template>
+  <div class="basic-main"  style="height: 100%">
+  <criteria-paged :model="model" :pager='false' v-ref:paged>
+    <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <p class="bg-info text-center" style="padding: 8px;">操作员结账报表</p>
+      <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+        <div class="row">
+            <div class="col-sm-4" >
+              <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="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+            <res-select restype='department'
+                        @res-select="$parent.$parent.getdep"
+                        :parentresid="$parent.$parent.depresid"
+                        :initresid='$parent.$parent.depid'>
+            </res-select>
+
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+            <res-select restype='user'
+                        @res-select="$parent.$parent.getuser"
+                        :parentresid="$parent.$parent.userresid"
+                        :initresid='$parent.$parent.operatorid'>
+            </res-select>
+          </div>
+        </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+             <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+             <report-excel id='gasprice'></report-excel>
+          </div>
+        </div>
+    </criteria>
+    <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+      <table class='tableprint' style="margin: 0px auto">
+        <thead>
+        <tr>
+          <th colspan='17' style="font-weight: normal; text-align: left;">
+            <h3 style="text-align: center">结账报表</h3>
+          </th>
+        </tr>
+        <tr>
+          <th colspan='17' style="font-weight: normal; text-align: center;">
+            开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+            结束时间：{{ model.model.endDate }}
+          </th>
+        </tr>
+        <tr>
+          <th colspan='17' style="font-weight: normal; text-align: center;">
+            <div>
+              <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+              <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+            </div>
+          </th>
+        </tr>
+        </thead>
+        <tr>
+          <td colspan='17'>
+            {{{ model.data.substring(26,model.data.length-8) }}}
+          </td>
+        </tr>
+      </table>
+      {{{ $parent.reportStr}}}
+    </div>
+  </criteria-paged>
+  <modal :show.sync="show" v-ref:modal small backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">输入文件名称</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+      <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+    </footer>
+  </modal>
+  </div>
+</template>
+
+<script>
+  import { DataModel } from 'vue-client'
+  import co from 'co'
+  let saveFile = function * (self) {
+    // 线验证文件是否重名
+    let count = yield self.$resetpost('rs/sql/manageSingleTable',
+      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+      {resolveMsg: null, rejectMsg: null})
+    if (count.data.length > 0) {
+      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+      return
+    }
+    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+      f_outlets: this.$login.f.depname})
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+  }
+  export default {
+    title: '结账报表',
+    props: ['data'],
+    data () {
+      return {
+        printTime: this.$login.toStandardTimeString(),
+        depresid: [],
+        userresid: [],
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        depname: '',
+        qishiDate:'',
+        jieshuDate:'',
+        startDate:'',
+        endDate:'',
+        operatorname: '',
+        f_inputtor:[],
+        f_user_type:'',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/checkoutReportTwo',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  depname:'this.model.depname',
+                  operatorname:'this.model.operatorname',
+                  qishiDate:'this.model.startDate.substring(0,10)',
+                  jieshuDate:'this.model.endDate.substring(0,10)'
+          },
+        ),
+
+        reportStr: null,
+        show: false
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.search()
+      console.log(this.$login.f)
+    },
+
+    methods: {
+
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        let orgcondition = '1 = 1'
+        if (this.f_orgid[0]){
+          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+        }
+        if (this.f_depid[0]) {
+          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+        }
+        if(this.depname){
+          this.$refs.paged.$refs.criteria.model.depname = this.depname
+        }else{
+          this.$refs.paged.$refs.criteria.model.depname = '无'
+        }
+
+        if(this.operatorname){
+          this.$refs.paged.$refs.criteria.model.operatorname = this.operatorname
+        }else{
+          this.$refs.paged.$refs.criteria.model.operatorname = '无'
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      getdep (obj, val) {
+        this.depname = val[0]
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser ( obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      },
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.reportStr = res.data.filecontent
+          this.model.state = '正确'
+        })
+      },
+      confirm () {
+        if (!this.filename || this.filename === '') {
+          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+        }
+        let saveGen = saveFile(this)
+        co(saveGen)
+      },
+      close () {
+        this.show = false
+      },
+      // 将报表保存成文件
+      confirmReport () {
+        this.show = true
+        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+      },
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      }
+    },
+    computed: {
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/components/sale/businessquery/AccountQuery/ExpectGasList.vue

@@ -296,7 +296,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           defaultPrint: ['f_gy_gas', 'f_sum_gas', 'f_sum_num', 'f_my_gas']
         },
         footer:[],
-        model: new PagedList('rs/sql/getExpectGasListExcel', 20,{},{
+        model: new PagedList('rs/sql/getExpectGasListExcel', 20,{id: 'this.model.id'},{
           f_gy_num:0,f_my_num:0,f_jt_num:0,f_sy_num:0,f_old_num:0,f_sum_num:0,
           f_gy_gas:0,f_my_gas:0,f_jt_gas:0,f_sy_gas:0,f_old_gas:0,f_sum_gas:0,
           f_gy_account:0,f_my_account:0,f_jt_account:0,f_sy_account:0,f_old_fee:0,f_sum_account:0
@@ -351,7 +351,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
-        new HttpResetClass().load('POST','rs/logic/getExpectGasListLogic',{condition:args.condition,isPage:true}).then(res =>{
+        args.model.id = this.$login.f.id
+        new HttpResetClass().load('POST','rs/logic/getExpectGasListLogic',{condition: args.condition,id: args.model.id}).then(res =>{
           this.model.search(args.condition, args.model)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         })
@@ -489,7 +490,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          id: this.$refs.paged.$refs.cri.model.id
+        }
       },
       getfield() {
         return exportConfig.expectgasConfig

package/src/components/sale/businessquery/AccountQuery/PreGasList.vue

@@ -197,7 +197,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
         config: {
           defaultPrint: ['f_wechat_pay', 'f_bank_pay', 'f_pre_deduct_money']
         },
-        model: new PagedList('rs/sql/getPreGasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/getPreGasListNew', 20,{
+          startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          id: 'this.model.id'
+        },{
           f_last_balance:0,
           f_wechat_pay:0,
           f_money_pay:0,
@@ -255,11 +258,13 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.model.id = this.$login.f.id
         new HttpResetClass().load('POST','rs/logic/getPreGasListNewLogic',
           {
             condition:args.condition,
             startDate:args.model.startDate,
-            endDate:args.model.endDate
+            endDate:args.model.endDate,
+            id: args.model.id
           }).then(res =>{
           this.model.search(args.condition, args.model)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -352,7 +357,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
           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,
+            id: this.$refs.paged.$refs.cri.model.id
+          }
+
       },
       getfield() {
         return exportConfig.pregaslistConfig

package/src/components/sale/businessquery/AccountQuery/SellingGasList.vue

@@ -211,7 +211,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           defaultPrint: ['f_account', 'f_pre_pay', 'f_month']
         },
         footer:[],
-        model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate', temp: 'this.model.temp'},{
+        model: new PagedList('rs/sql/getSellinggasListNew', 20,
+          {startDate: 'this.model.startDate', endDate: 'this.model.endDate', temp: 'this.model.temp',id: 'this.model.id'},
+          {
           f_last_balance:0,
           f_account:0,
           f_wechat_pay:0,
@@ -276,23 +278,26 @@ import {HttpResetClass, PagedList} from 'vue-client'
           orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         args.condition = orgcondition
+        args.model.id = this.$login.f.id
         let s = new Date(new Date().getFullYear(), new Date().getMonth(), 1)
         let e = new Date(args.model.endDate)
         if (s <= e) {
           args.model.temp = true
+          new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
+            {
+              condition:args.condition,
+              startDate:args.model.startDate,
+              endDate:args.model.endDate,
+              id: args.model.id
+            }).then(res =>{
+            this.model.search(args.condition, args.model)
+          })
         }else {
           args.model.temp = false
+          this.model.search(args.condition, args.model)
         }
-        this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        // new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
-        //   {
-        //     condition:args.condition,
-        //     startDate:args.model.startDate,
-        //     endDate:args.model.endDate
-        //   }).then(res =>{
-        //
-        // })
+
       },
       clear() {
         //清空部门和人员
@@ -386,7 +391,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
           condition: this.$refs.paged.model.condition,
-          temp: this.$refs.paged.$refs.cri.model.temp
+          temp: this.$refs.paged.$refs.cri.model.temp,
+          id: this.$refs.paged.$refs.cri.model.id
         }
       },
       getfield() {