manage-client 3.2.155 → 3.2.157

package/src/components/SellReport/shoufeistyle.vue

@@ -0,0 +1,449 @@
+<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 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 00:00:00'"
+                              :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 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <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-2 form-group">
+                  <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-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='user'
+                              is-mul="false"
+                              @res-select="$parent.$parent.getuser"
+                              :parentresid="$parent.$parent.userresid"
+                              :initresid='$parent.$parent.operatorid'>
+                  </res-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</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="shoufeistyle"
+                                template-name='收费划价查询明细'
+                                :choose-col="true"></export-excel>
+                  <print-data-self :model="$parent.model" :field="$parent.$parent.getfield"
+                                   :defaultfield="$parent.$parent.defaultfield" printName="营业厅明细"
+                                   :sumsmodel="$parent.$parent.sumsmodel" :sum-field="$parent.$parent.sumField" :page-sum="$parent.$parent.pageSum"
+                                   :start-date="$parent.$parent.startDate" :end-date="$parent.$parent.endDate"
+                  ></print-data-self>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <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>
+                <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>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+
+            </template>
+            <template partial='foot'></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" v-if="startDate==endDate">
+              {{startDate}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-else>
+              {{startDate+" 至 "+endDate}}
+            </td>
+          </tr>
+          <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_gas.toFixed(2)}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              金额汇总:&emsp;{{sumsmodel.f_money.toFixed(2)}}
+            </td>
+
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import defaultPrint from '../sale/config/DefaultPrint'
+import exportConfig from '../sale/config/exportConfig'
+import PrintDataSelf from '../sale/common/PrintDataSelf'
+
+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.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  title: '收费划价查询明细',
+  props: ['data'],
+  data() {
+    return {
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: [],
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      data: {},
+      other:[],
+      footer:[],
+      model: new PagedList('rs/sql/shoufeistyle', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
+        f_gas:0,
+        f_money:0
+      }),
+      gasproperties:[],
+      show:false,
+      rowdata:{},
+      residentialArea: [],
+      modelval: [],
+      startDate:"",
+      endDate:"",
+      inputtouPerson: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+
+      // 下拉框
+
+      //合计数据
+      sumsmodel: {},
+      sumField: {
+        'f_gas': '气量汇总', 'f_money': '金额汇总'
+      },
+      pageSum: {
+        'f_gas': '0.00',
+        'f_money': '0.00'
+      },
+      defaultfield: [],
+      config: {
+        defaultPrint: ['f_userinfo_code', 'f_user_name']
+      },
+      batchmoneyShow:false
+    }
+  },
+  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) {
+      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      if (this.f_depid[0]) {
+        orgcondition += " and f_depid in("+this.f_depid.toString()+')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+      }
+      this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
+      this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
+      this.orgCondtionStr=orgcondition
+      this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
+      this.model.search(args.f_orgid, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = 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
+    },
+    dealmsg(val) {
+      console.log('---------------dealmsg')
+      this.rowdata=val
+      this.show=true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    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)
+    },
+    userTypeChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.criteria.model !==null) {
+        this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+  },
+  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,
+        f_orgid: this.orgCondtionStr
+
+      }
+
+    },
+    getfield() {
+      return exportConfig.shoufeistyle
+    },
+    whetherpaies () {
+      return [
+        {label: '全部', value: ''},
+        {label: '已缴费', value: '是'},
+        {label: '未缴费', value: '否'}
+      ]
+    },
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+
+  }
+}
+</script>

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

@@ -162,6 +162,9 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>操作</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body'>
@@ -228,6 +231,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>
+              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -252,6 +258,13 @@
       </div>
     </div>
   </div>
+  <modal :show.sync="showdetail" width="80%" title="详细记录" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 700px">
+      <charge-query :batchid="f_batch_id" :data="data" v-if="showdetail"></charge-query>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 </template>
 
 <script>
@@ -270,6 +283,8 @@
     title: '团缴查询',
      data() {
       return {
+        f_batch_id: null,
+        showdetail: false,
         isSingleUser: null,
         startDate1:'',
         endDate1:'',
@@ -319,6 +334,10 @@
       })
     },
     methods: {
+      showchargedetail(row){
+        this.showdetail = true
+        this.f_batch_id = row.id
+      },
       getotherfooter () {
         // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];

package/src/components/sale/config/exportConfig.js

@@ -352,6 +352,20 @@ export default{
     'f_gas1': '阶一气量', 'f_gas2': '阶二气量', 'f_gas3': '阶三气量',
     'f_preamount': '收费金额', 'f_user_type': '用户类型', 'f_type': '收费类型', 'f_date': '日期', 'f_operator': '操作员'
   },
+  chaostyle: {
+    'f_userinfo_code': '用户号', 'f_user_name': '用户名', 'f_address': '用户地址', 'f_last_tablebase': '起方',
+    'f_tablebase': '止方', 'gas': '气量', 'f_price': '单价',
+    'f_money': '金额', 'f_accounts_state': '下账状态', 'f_book_name': '抄表册', 'f_inputtor': '抄表员', 'f_operatorr': '录入员', 'f_audit_person': '审核人',
+    'f_audit_date': '审核日期','f_meter_state': '抄表状态','f_hand_state': '表单状态','f_user_type': '客户类型','f_gasproperties': '用气性质',
+    'f_price_id': '气价编号','f_price_name': '气价名称','f_meter_classify': '气表分类','f_accounting_date': '截止日期','beizhu': '备注',
+    'f_meter_brand': '气表型号','f_calculation': '结算方式'
+  },
+  shoufeistyle: {
+    'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
+    'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_price_name': '价格类型',
+    'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_price': '单价', 'f_gas': '气量', 'f_money': '金额', 'f_type': '收费类型',
+    'f_payment': '收款方式','f_operate_date': '收费日期','f_operator': '操作员','f_depname': '部门','f_orgname': '公司'
+   },
   chargeSchedule: {
     'f_serial_id': '流水号', 'f_userinfo_code': '户号', 'f_user_name': '户主', 'f_address': '地址',
     'a': '气量', 'b': '金额', 'f_operator': '收费员',

package/src/filiale/liaoyuan/RecordInfoQuery.vue

@@ -386,6 +386,20 @@
                                 condition="f_llj_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">设备类型</label>
+                    <v-select :value.sync="row.f_devices_type" v-model="row.f_devices_type"
+                              :options='$parent.$parent.devicetypes' placeholder='设备类型' :value-single="true"
+                              condition="f_devices_type = '{}'"
+                              close-on-select></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">使用时间</label>
+                    <v-select :value.sync="row.f_use_date" v-model="row.f_use_date"
+                              :options='$parent.$parent.useDate' placeholder='使用时间' :value-single="true"
+                              condition="f_cost_type = '{}'"
+                              close-on-select></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -431,7 +445,10 @@
                   <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>
@@ -539,7 +556,10 @@
                 <td style="text-align: center;"><nobr>{{row.f_credentials}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_idnumber}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_people_num}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_ins_stop_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_last_check_date}}</nobr></td><!--最后安检日期-->
+                <td style="text-align: center;"><nobr>{{row.f_ins_stop_date}}</nobr></td><!--保险结束日期-->
+                <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td><!--设备类型-->
+                <td style="text-align: center;"><nobr>{{row.f_use_date}}</nobr></td><!--使用时间-->
                 <td style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_createfile_person}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>
@@ -724,6 +744,7 @@
         // 下拉框参数
         userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
         bandstates:this.$appdata.getParam('微信绑定') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('微信绑定')] : [],
+        devicetypes: this.$appdata.getParam('设备类型'),
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -735,6 +756,7 @@
         bookSlice:[{label: '全部',value: ''}],
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        useDate:[{label:"8年以内",value:"8年以内"},{label:"8年以上",value:"8年以上"}]
       }
     },
     ready(){

package/src/filiale/liaoyuan/exportConfig.js

@@ -130,10 +130,11 @@ export default{
     'f_user_state': '客户状态','f_userinfo_code': '客户编号','f_card_id': '卡号','f_user_name': '客户名称',
     'f_residential_area': '小区名称','f_address': '客户地址','f_user_phone': '客户电话',
     'f_gas_date': '通气日期','f_price_name': '气价名称','f_position': '安装位置','f_meter_type': '气表类型','f_meter_brand': '气表品牌',
-    'f_meternumber': '表号','f_metertitles': '表封号','f_aroundmeter': '左右表','f_install_date': '安装日期','f_meter_base': '气表底数',
+    'f_meternumber': '表号','f_metertitles': '表封号','f_aroundmeter': '左右表','f_install_date': '安装日期','f_llj_date': '生产日期','f_meter_base': '气表底数',
     'f_balance': '账户余额','f_hand_date': '最后抄表日期','f_whether_hairpin': '是否发卡',
     'f_valve_state': '阀门状态','f_user_type': '客户类型','f_gasproperties': '用气性质',
-    'f_open_date': '开户时间','f_credentials': '证件类型','f_idnumber': '证件号码','f_people_num': '人口数','f_ins_stop_date': '保险结束日期',
+    'f_open_date': '开户时间','f_credentials': '证件类型','f_idnumber': '证件号码','f_people_num': '人口数','f_last_check_date': '最后安检日期',
+    'f_ins_stop_date': '保险结束日期','f_devices_type': '设备类型','f_use_date': '使用时间',
     'f_createfile_date': '建档日期','f_createfile_person': '建档人','f_depname': '所属营业厅','f_comments': '备注信息',
     'f_used_name': '曾用名','f_rent_phone': '备用电话','f_rent_name': '租户姓名','f_zuhu_phone': '租户电话',
     'f_contract_id': '合同ID','f_is_mgq': '是否煤改气','f_send_usegas_card': '是否发放天然气使用证',

package/src/filiale/qianneng/ChargeQuery.vue

@@ -820,7 +820,7 @@
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
-    props:['data'],
+    props:['data', 'batchid'],
     title: '收费查询',
      data() {
       return {
@@ -904,6 +904,12 @@
       }
     },
     ready() {
+      if (this.batchid) {
+        this.$refs.paged.$refs.cri.model.startDate = this.data ? this.data.startDate : this.$login.toStandardDateString() + ' 00:00:00'
+        this.$refs.paged.$refs.cri.model.endDate = this.data ? this.data.endDate : this.$login.toStandardDateString() + ' 23:59:59'
+        this.$refs.paged.$refs.cri.search()
+        return
+      }
       // this.$refs.paged.$refs.cri.model.f_state=['有效']
       this.getaddress()
       this.getEquipment()
@@ -1055,7 +1061,7 @@
         this.prices = this.$MagGetSaleParam.getPrices();
       },
       selfSearch(args) {
-        if (this.data) {
+        if (this.data && !this.batchid) {
           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
         }
@@ -1068,6 +1074,9 @@
         if(this.IdCardInfo!=''){
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
+        if (this.batchid) {
+          args.condition += ` and f_batch_id=${this.batchid}`
+        }
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''

package/src/filiale/tongchuan/HandplanQuery.vue

@@ -1026,6 +1026,14 @@
         this.show = false
       },
       selfSearch(args) {
+        if (!args.model.startDate) {
+          this.$showMessage('开始日期必填!')
+          return
+        }
+        if (!args.model.endDate) {
+          this.$showMessage('结束日期必填!')
+          return
+        }
         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