sale-client 3.6.270 → 3.6.271

package/build/dev-server.js

@@ -1,5 +1,7 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+var checkVersion = require('./versionCheck.js')
+checkVersion()
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -17,6 +19,9 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
+      '/api': {
+        target: v4Url
+      },
       '/invoice/rs/logic/getInvoice': {
         target: serverRul
       },

package/build/versionCheck.js

@@ -0,0 +1,28 @@
+function isVersionGreaterThan(version1, version2) {
+  const v1parts = version1.split('.')
+  const v2parts = version2.split('.')
+
+  for (let i = 0; i < v1parts.length; ++i) {
+    if (v2parts.length === i) {
+      return true
+    }
+    return v1parts[i] >= v2parts[i]
+  }
+
+  return v1parts.length !== v2parts.length
+}
+
+const pkg = require('../package.json')
+const checkVersion = () => {
+  const {devDependencies} = pkg
+  if (devDependencies && devDependencies['system-clients']) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.93')) {
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请查看营收后台升级日志：http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
+    }
+  }
+}
+
+module.exports = checkVersion

package/build/webpack.base.conf.js

@@ -112,4 +112,3 @@ module.exports = {
   plugins: [
   ]
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.270",
+  "version": "3.6.271",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.137",
+    "vue-client": "1.24.146",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
@@ -90,7 +90,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.61",
+    "system-clients": "3.2.93",
     "url-loader": "^0.5.7",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",

package/src/components/revenue/cardHandManage/cardDown.vue

@@ -787,7 +787,7 @@ export default {
       this.inputtor_change = args.condition.includes('未抄表')
 
       if (!this.orgCondtionStr) {
-        args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        args.condition = `${args.condition}  and f_orgid = '${this.$login.f.orgid}'`
       } else {
         args.condition = `${args.condition}` + this.orgCondtionStr
       }

package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue

@@ -267,7 +267,7 @@
           }
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         this.row = row.data[0]
-        this.invoice_show_gas = this.row.f_collection_type = '按气量' ? '是' : '否'
+        this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
         if (!this.row.f_taxpayer_id) {
           this.row.f_taxpayer_id = this.row.f_idnumber
         }

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenCard.vue

@@ -59,10 +59,10 @@
       <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
         <template partial='head'>
           <tr>
-            <!--<th>-->
-            <!--  <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"-->
-            <!--         style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">-->
-            <!--</th>-->
+            <th>
+              <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"
+                     style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">
+            </th>
             <th>客户编号</th>
             <th>客户姓名</th>
             <th>客户地址</th>
@@ -78,10 +78,10 @@
         </template>
         <template partial='body' :model="model">
           <tr>
-            <!--<td style="text-align:center">-->
-            <!--  <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"-->
-            <!--         style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">-->
-            <!--</td>-->
+            <td style="text-align:center">
+              <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"
+                     style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">
+            </td>
             <th style="text-align:center">{{ row.f_userinfo_code }}</th>
             <th style="text-align:center">{{ row.f_user_name }}</th>
             <th style="text-align:center">{{ row.f_address }}</th>
@@ -236,7 +236,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = _row.data[0]
       this.row.id = row.id
-      this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
+      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
       if (!this.row.f_taxpayer_id) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }
@@ -273,7 +273,7 @@ export default {
         }
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = row.data[0]
-      this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
+      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
       if (!this.row.f_taxpayer_id) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenJBPage.vue

@@ -237,7 +237,7 @@ export default {
       this.row = _row.data[0]
       this.row.id = row.id
       this.selecteds = [{id: row.id}]
-      this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
+      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
       if (!this.row.f_taxpayer_id) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }
@@ -247,9 +247,6 @@ export default {
       if (!this.row.f_address_phone) {
         this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
       }
-      if (!this.row.f_email) {
-        this.row.f_email = this.row.f_email
-      }
       this.eticket_msg = true
     },
     async open_eTicket () {

package/src/components/revenue/comprehen/Message/AllUser.vue

@@ -41,6 +41,16 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div  class="form-group col-sm-3">
+              <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;&nbsp;司</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          v-model="$parent.$parent.f_filialeid"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户状态</label>
               <v-select id="f_whether"
@@ -342,6 +352,7 @@
         meterbrands: [{label: '全部', value: ''}],
         getsendType: this.$appdata.getParam('短信类型'),
         msg: '',
+        curorgid: [this.$login.f.orgid],
         ids: [],
         pages: [],
         msg_old: '',
@@ -360,6 +371,7 @@
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('用气性质')] : [],
+        f_filialeid:[],
         f_whether: '全部',
         pcdslist: [],
         isFirst: true
@@ -445,6 +457,10 @@
       hidden () {
         this.criteriaShow = !this.criteriaShow
       },
+      getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeid = val
+    },
       closeEdit () {
         this.allshow2 = false
       },
@@ -537,7 +553,7 @@
         console.log('args1:', args)
         args.condition = `${args.condition} and f_user_state = '正常'`
         args.condition = `${args.condition} and f_orgid = '${Vue.$login.f.orgid}'`
-        console.log('args.model', args.model)
+        // console.log('args.model', args.model)
         let val = '1=1'
         if (args.model.f_send_type  && args.model.f_send_type.toString() !== '') {
           val += ` and f_send_type = '${args.model.f_send_type}'`
@@ -548,6 +564,19 @@
         if (args.model.endDate1  && args.model.endDate1.toString() !== '') {
           val += ` and f_createdate <= '${args.model.endDate1}'`
         }
+        if(this.f_filialeid && this.f_filialeid.length <= 1){
+          val += ` and f_filialeid in ('${this.f_filialeid.toString()}')`
+        }
+        if(this.f_filialeid && this.f_filialeid.length > 1){
+          let str = this.f_filialeid.reduce((res,item,index)=>{
+            if(index < this.f_filialeid.length-1)
+            return res+`'${item}',`
+            if(index = this.f_filialeid.length-1)
+            return res+`'${item}'`
+          },'')
+          val += ` and f_filialeid in (${str})`
+        }
+        console.log(args.condition, args.model,val);
         this.model.search(args.condition, args.model,val)
         if (this.isFirst) {
           this.isFirst = false

package/src/filiale/jingyang/EticketPrint.vue

@@ -64,16 +64,20 @@ export default {
     /**
      *
      * @param id 收费id
-     * @param ticket_id 票据信息 id
+     * @param model
+     * @param f_charge_type
+     * @param retry
+     * @param is_tax
+     * @param invoice_type
      * @returns {Promise<void>}  如果查到返回url
      */
-    async openETicket (id, model, f_charge_type, is_tax, invoice_type) {
+    async openETicket (id, model, f_charge_type, retry = false, is_tax, invoice_type) {
       console.log('>>> f_invoice_type', invoice_type)
       try {
         let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
-          retry: false,
+          retry,
           isTax: is_tax === '不征税' ? 0 : 1,
           invoice_kind: invoice_type,
           f_buy_openbank: model.f_paper_account,

package/src/filiale/jingyang/EticketV4/CustQueryEticket.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="auto basic-main" style="height:95%">
+    <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">
+          <res-select-group :show-component="['company','department', 'operator']" :initres="$parent.$parent.initres"
+                            @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+          <div  class="form-group col-sm-2">
+            <label class="font_normal_body">客户编号</label>
+            <input  type="text" class="form-control" v-model="model.f_userinfo_code" style="width:60%"
+                    condition="f_userinfo_code = '{}' "  placeholder="客户编号"
+            >
+          </div>
+          <div  class="form-group col-sm-2">
+            <label class="font_normal_body">用户姓名</label>
+            <input  type="text" class="form-control" v-model="model.f_user_name" style="width:60%"
+                    condition="f_user_name = '{}'" placeholder="用户姓名"
+            >
+          </div>
+            <div style="float: right">
+              <button class="button_search"  @click="search()">查 询</button>
+              <button class="button_search"  @click="$parent.$parent.open_eTicket()">开票</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.fields"
+                            sqlurl="rs/logic/saleExport" sql-name="openSellelent"
+                            template-name='发票记录导出'
+                            :choose-col="true">
+              </export-excel>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div  class="form-group col-sm-2" >
+              <label class="font_normal_body">业务类型</label>
+              <v-select id="f_charge_type"
+                        style="width:60%"
+                        v-model="model.f_type"
+                        placeholder='业务类型'
+                        condition="f_type ='{}'"
+                        :value.sync="model.f_type"
+                        :options='$parent.$parent.chargetypes'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="startDate" class="font_normal_body">开始日期</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          condition="f_operate_date >='{}'"
+                          style="width:60%"
+                          >
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="endDate" class="font_normal_body">结束日期</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          condition="f_operate_date <='{}'"
+                          style="width:60%"
+                         >
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>客户编号</th>
+            <th>用户姓名</th>
+            <th>用户地址</th>
+            <th>气量</th>
+            <th>应交金额</th>
+            <th>实收金额</th>
+            <th>收费类型</th>
+            <th>收费时间</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body'  >
+          <td style="text-align:center">{{$index+1}}</td>
+          <td style="text-align:center">{{row.f_userinfo_code}}</td>
+          <td style="text-align:center">{{row.f_user_name}}</td>
+          <td style="text-align:center">{{row.f_address}}</td>
+          <td style="text-align:center">{{row.f_pregas}}</td>
+          <td style="text-align:center">{{row.f_preamount}}</td>
+          <td style="text-align:center">{{row.f_collection}}</td>
+          <td style="text-align:center">{{row.f_type}}</td>
+          <td style="text-align:center">{{row.f_operate_date}}</td>
+          <td>
+            <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
+          </td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
+      <h4 class="modal-title">发票信息</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="auto select-overspread form-horizontal">
+        <div class="row auto">
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
+            <label class="control-label">开票名称:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_paper_name" placeholder="开票名称">
+          </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!invoice_is_pax ? 'has-error' : '']">
+            <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+            <v-select v-model="invoice_is_pax"
+                      placeholder='请选择'
+                      :value.sync="invoice_is_pax"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='is_pax' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group form-input-group"  :class="[!row.f_paper_type || !row.f_paper_type === '' ? 'has-error' : '']">
+            <label class="control-label">发票种类:</label>
+            <v-select v-model="row.f_paper_type"
+                      placeholder='请选择'
+                      :value.sync="row.f_paper_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label">开户行及账号:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_paper_account" placeholder="购方开户行及账号">
+          </div>
+          <div class="col-sm-12 form-group form-input-group" >
+            <label class="control-label">纳税人识别号:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
+          </div>
+          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+            <label class="control-label">开票地址电话:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_address_phone" placeholder="开票地址">
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label">邮箱推送:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_email" placeholder="邮箱推送">
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label">备注:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_remarks" placeholder="备注">
+          </div>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn button_search"
+              :disabled="!(row.f_paper_name&&row.f_paper_type&&invoice_is_pax&&row.f_paper_type!== '')"
+              @click='confirm'>确认开票
+      </button>
+    </footer>
+  </modal>
+  <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
+</template>
+
+<script>
+  /**
+   *发票冲红管理
+   */
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import Vue from 'vue'
+  export default {
+    title: '结算开票',
+    data () {
+      return {
+        criteriaShow: false,
+        f_filialeids: Vue.$login.f.orgids,
+        model: new PagedList('rs/sql/openSellelent', 50, {}),
+        f_outlets: Vue.$login.f.f_parentname,
+        f_filiale: Vue.$login.f.f_fengongsi,
+        f_operator: Vue.$login.f.name,
+        f_orgstr: Vue.$login.f.orgpathstr,
+        invoice_types: this.$appdata.getParam('发票种类'),
+        invoice_is_pax: '征税',
+        is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+        selecteds: [],
+        eticket_show: false,
+        eticket_msg: false,
+        invoice_show_gas: '否',
+        show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+        row: {},
+        disabled: false,
+        printstyle: this.$appdata.getParam('打印电子格式') ? this.$appdata.getParam('打印电子格式') : [{label: '电子发票', value: '电子发票'}],
+        mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        fields: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_address': '用户地址',
+          'f_user_type': '用户类型',
+          'f_gasproperties': '用气性质',
+          'f_collection': '实收金额',
+          'f_pregas': '预购气量',
+          'f_preamount': '预购金额',
+          'f_type': '收费类型',
+          'f_bill_style': '发票类型',
+          'f_state': '收费状态',
+          'f_operate_date': '收费日期',
+          'f_payment': '付款方式',
+          'f_bill_null': '是否有票'
+        }
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    },
+    methods: {
+      getRes (obj) {
+        this.orgCondtionStr = obj
+      },
+      async kp (row) {
+        let HttpReset = new HttpResetClass()
+        let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+          data: {
+            orderitem: 'f_userinfo_code',
+            condition: `f_userinfo_code = '${row.f_userinfo_code}' and u.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        this.row = _row.data[0]
+        this.row.id = row.id
+        this.row.f_type = row.f_type
+        this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
+        if (!this.row.f_taxpayer_id) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        if (!this.row.f_email) {
+          this.row.f_email = this.row.f_email
+        }
+        this.eticket_msg = true
+      },
+      closeEticket () {
+        this.eticket_msg = false
+        this.disabled = false
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      },
+      cancel () {
+        this.show = false
+        this.info = {}
+      },
+      async open_eTicket () {
+        if (this.selecteds.length > 1) {
+          this.$showAlert('选中条数大于一条，请重新修改！！', 'warning', 2000)
+          return
+        }
+        let HttpReset = new HttpResetClass()
+        let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+          data: {
+            orderitem: 'f_userinfo_code',
+            condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}' and u.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        this.row = row.data[0]
+        this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+        if (!this.row.f_taxpayer_id) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        if (this.selecteds.map(item => item.f_type).toString() == '其他收费') {
+          this.disabled = true
+        }
+
+        this.eticket_msg = true
+      },
+      confirm () {
+        // this.row.f_print = this.invoice_is_pax
+        this.row.invoice_is_pax = this.invoice_is_pax
+        this.eticket_msg = false
+        this.disabled = false
+        this.eticket_show = true
+        this.$refs.eticketbill.openETicket(this.row.id, this.row, this.row.f_type)
+      },
+      eticket_toggle () {
+        this.eticket_show = false
+        this.search()
+      },
+      async selfSearch (args) {
+        // if (!this.f_orgid) {
+        //   this.getorg([this.$login.f.orgid])
+        // }
+        // args.condition = ` f_orgid='${this.f_filialeids}' and ${args.condition}`
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + ' and s.f_orgid = ' + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+
+        await this.model.search(args.condition, this.model)
+        this.addOrRemove(true)
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('refresh')
+      },
+      addOrRemove (is) {
+        this.selecteds = []
+        if (!is) { // 添加本页所有数据到ids中
+          this.model.rows.forEach((row) => {
+            this.selecteds.push(row)
+          })
+          this.selectAll = true
+        } else { // 从ids中取消所有的数据
+          this.selecteds = []
+          this.selectAll = false
+        }
+        console.log('selectdde', this.selecteds)
+      }
+    },
+    computed: {
+      chargetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+      },
+      getCondition () {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem ? `${this.orderitem}` : ' f_operate_date desc'
+        }
+      }
+    },
+    watch: {
+      selecteds () {
+        console.log('框框的长度', this.selecteds.length)
+      }
+    }
+  }
+</script>