sale-client 3.6.554 → 3.6.555

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.554",
+  "version": "3.6.555",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/base/rightview/CardList.vue

@@ -301,9 +301,9 @@
       search () {
         let condition = '1=1'
         if (this.f_orgid) {
-          condition += `and (u.f_filialeid in ${this.f_orgid} or g.f_orgid in ${this.f_orgid}) `
+          condition += `and (u.f_filialeid in ${this.f_orgid} or u.f_orgid in ${this.f_orgid}) `
         } else {
-          condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or g.f_orgid ='${this.$login.f.orgid}')`
+          condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or u.f_orgid ='${this.$login.f.orgid}')`
         }
         this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
           if (a.data.length === 0) {

package/src/filiale/haile/CardList.vue

@@ -150,6 +150,7 @@
                 <price-adjustment-detail :data="row" v-if="row.type === '价格补差'"></price-adjustment-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
                 <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
+                <valve-record :data="row" v-if="row.type === '机表开阀' || row.type === '机表关阀'"></valve-record>
               </div>
               <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
                 <span>{{row.f_describe}}</span>
@@ -339,7 +340,7 @@
             f_money: `'${result.data.sell.f_collection}'`,
             f_omoney: `'${result.data.sell.f_delaypay}'`,
             f_balance: `'${result.data.sell.f_curbalance}'`,
-            f_operator: `'${this.$login.f.name}'`
+            f_operator: `'${result.data.sell.f_operator}'`
           }
         }
         console.log('最终打印的数据', this.bookData)

package/src/filiale/haile/UserBaseInfoNew.vue

@@ -165,6 +165,8 @@
               class="button_search" type="button" @click="openUser">开户</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="valvecontrol">开关阀</button>
+      <button v-if="row.f_meter_type.includes('机表')"
+              class="button_search" type="button" @click="jiBiaoValveControl">机表开关阀</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="zdfk">开关自动阀控</button>
       <div
@@ -247,6 +249,24 @@
       <button  type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false)'>关阀</button>
     </footer>
   </modal>
+    <!--阀控管理弹框-->
+    <modal :show.sync="jiBiaoValve">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close()"><span>&times;</span></button>
+        <h4 class="modal-title" align="center">机表阀门管理</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group " style="padding-left: 8px">
+          <label  class="font_normal_body" :class="operateReason?'text-info':'text-danger'">操作原因</label>
+          <textarea class="form-control" style="width:80%" v-model="operateReason" rows="3" placeholder="请填写操作原因"></textarea>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button  type="button" class="button_search btn-ln fr" :disabled="!operateReason"  @click='jiBiaoValveOperate(true)'>开阀</button>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <button  type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='jiBiaoValveOperate(false)'>关阀</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -272,7 +292,8 @@
         valveLimit: false,
         // 开关阀操作原因
         operateReason: '',
-        valve: false
+        valve: false,
+        jiBiaoValve: false
       }
     },
 
@@ -383,8 +404,16 @@
           this.$showAlert('您没有开关阀权限,请联系管理员！！', 'warning', 3000)
         }
       },
+      jiBiaoValveControl () {
+        if (this.$login.r.includes('开关阀')) {
+          this.jiBiaoValve = true
+        } else {
+          this.$showAlert('您没有开关阀权限,请联系管理员！！', 'warning', 3000)
+        }
+      },
       close () {
         this.valve = false
+        this.jiBiaoValve = false
         this.operateReason = ''
       },
       // 开关阀操作
@@ -407,6 +436,27 @@
             this.valve = false
             this.operateReason = ''
           })
+      },
+      async jiBiaoValveOperate (oper) {
+        let msg = oper ? '机表开阀' : '机表关阀'
+        let data = {
+          f_operator: Vue.$login.f.name,
+          f_operatorid: Vue.$login.f.id,
+          f_orgid: Vue.$login.f.orgid,
+          f_orgname: Vue.$login.f.orgs,
+          f_depid: Vue.$login.f.depids,
+          f_depname: Vue.$login.f.deps,
+          f_comments: this.operateReason,
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_user_id: this.row.f_user_id,
+          f_operat_type: msg
+        }
+        await this.$resetpost('rs/logic/jiBiaoValveOperate', {data: data},
+          {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
+            this.jiBiaoValve = false
+            this.operateReason = ''
+          })
       }
     },
     watch: {

package/src/filiale/haile/sale.js

@@ -27,4 +27,6 @@ export default function () {
   // 机表查询
   Vue.component('un-handplan-query', (resolve) => { require(['./unHandplanQuery'], resolve) })
   Vue.component('card-list', (resolve) => { require(['./CardList'], resolve) })
+  // 机表关阀开阀详情小组件
+  Vue.component('valve-record', (resolve) => { require(['./valveRecord'], resolve) })
 }

package/src/filiale/haile/valveRecord.vue

@@ -0,0 +1,58 @@
+<template>
+    <div class="auto">
+      <partial-view v-ref:pv>
+      <div class="row">
+        <label class = "col-sm-4">客户名称:</label>
+        <span style="padding:0" class = "col-sm-8">{{model.f_user_name}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">客户编号:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.f_userinfo_id}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">开关阀原因:</label>
+        <pre style="padding:0" class = "col-sm-8">{{model.f_comments}}</pre>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作人:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.f_operator}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作时间:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
+      </div>
+    </partial-view>
+    </div>
+</template>
+
+<script>
+export default {
+  title: '销户详情',
+  props: ['data'],
+  data () {
+    return {
+      model: {}
+    }
+  },
+  ready () {
+    let sql = 'singleTable_OrderBy'
+    let condition = {
+      items: 'r.f_userinfo_id,f_operate_date,f_comments,f_operator,t.f_user_name',
+      tablename: 't_record r left join (select f_user_name,f_userinfo_id from t_userinfo)t on t.f_userinfo_id = r.f_userinfo_id',
+      condition: 'id = ' + this.data.id,
+      orderitem: 'id'
+    }
+    this.$info(`加载数据中..., sql:${sql}`)
+    this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {
+      this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
+      this.model = a.data
+    }).catch((error) => {
+      if (error.status) {
+        this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+        return
+      }
+      throw error
+    })
+  }
+}
+</script>

package/src/filiale/jingyang/sale.js

@@ -39,4 +39,7 @@ export default function () {
   Vue.component('wechat-validate-manage', (resolve) => { require(['./wechatValidateManage.vue'], resolve) })
   // pos对账界面
   Vue.component('query-instruct', (resolve) => { require(['./QueryInstruct.vue'], resolve) })
+  // 自助机对账
+  Vue.component('wechat-validate', (resolve) => { require(['./wechatValidate.vue'], resolve) })
+  Vue.component('wechat-validate-refund', (resolve) => { require(['./wechatValidateRefund.vue'], resolve) })
 }

package/src/filiale/jingyang/wechatValidate.vue

@@ -0,0 +1,61 @@
+<template>
+  <!--  <div v-if="listpage">-->
+  <tab-button v-ref:list>
+    <tabs header="自助机对账明细">
+      <wechat-validate-manage @deal-msg="dealMsg"></wechat-validate-manage>
+    </tabs>
+    <tabs header="自助机对账退费">
+      <wechat-validate-refund @deal-msg="dealMsg"></wechat-validate-refund>
+    </tabs>
+  </tab-button>
+  <!--  </div>-->
+  <!--  <div v-if="!listpage">-->
+  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+  <!--  </div>-->
+</template>
+
+<script>
+  import TabButton from '../../components/revenue/comprehen/common/TabButton'
+  import Tabs from '../../components/revenue/comprehen/common/Tabs'
+
+
+  export default {
+    name: 'wechatValidate',
+    title: '自助机对账',
+    data () {
+      return {// 页面开关
+        f_start_date: '',
+        f_end_date: '',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        show: [true]
+      }
+    },
+    components: {Tabs, TabButton},
+    ready () {
+      console.log(this.$refs.list)
+      console.log('自助机对账')
+    },
+    methods: {
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg (obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/jingyang/wechatValidateManage.vue

@@ -49,6 +49,12 @@
 
             <div class="span" style="float:right;">
               <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+              <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                            :footer="$parent.$parent.footer"
+                            :field="$parent.$parent.getExportField"
+                            :header="$parent.$parent.other"
+                            sqlurl="rs/logic/saleExport" sql-name="wechatSelling" template-name='自助机对账导出'
+                            :choose-col="true"></export-excel>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                 @click="$parent.$parent.hidden()"
@@ -181,12 +187,12 @@
           <td v-if="row.pay_state==='对账成功'" style="text-align: center;">
             <div v-if="!$parent.$parent.$parent.authArr.includes('无卡退费')">
               <span>正常</span>
-              <button type="button" name="button" class="btn btn-link"
+              <button type="button" name="button" class="btn btn-link" v-if="this.$login.r.includes('自助机对账退款')"
                       @click="$parent.$parent.$parent.updateState(row)">退款
               </button>
             </div>
             <div v-else>
-              <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.chargecal(row)">
+              <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.chargecal(row)" v-if="this.$login.r.includes('自助机对账退款')">
                 无卡退款
               </button>
             </div>
@@ -200,7 +206,7 @@
             </button>
           </td>
           <td v-if="row.pay_state==='自助机单方面账单'" style="text-align: center;">
-            <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.updateState(row)">
+            <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.updateState(row)" v-if="this.$login.r.includes('自助机对账退款')">
               退款
             </button>
             <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.charge(row)">缴费
@@ -281,7 +287,30 @@ export default {
       initres: {
         org: [this.$login.f.orgid]
       },
-      msgData: []
+      msgData: [],
+      getExportField: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_user_phone': '客户电话',
+        'f_address': '客户地址',
+        'f_meter_classify': '气表类型',
+        'f_bank_name': '缴费银行',
+        'f_terminal_num': '终端编号',
+        'f_transaction_id': '订单号',
+        'f_total_fee': '订单金额',
+        'f_time_out': '订单发生日期',
+        'f_states': '订单状态',
+        'f_payment': '付款方式',
+        'f_pregas': '购气量',
+        'f_collection': '购气金额',
+        'f_delivery_date': '系统收费时间',
+        'f_charge_state': '系统收费状态',
+        'f_write_card': '系统写卡状态',
+        'f_operator': '操作人'
+      },
+      condition2: '',
+      other: [],
+      footer: []
     }
   },
   props: [],
@@ -357,23 +386,23 @@ export default {
     search () {
       this.$refs.paged.$refs.cri.search()
     },
-    // 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)
-    // },
+    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)
+    },
     selfSearch (args) {
       this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
       this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
@@ -383,6 +412,7 @@ export default {
         args.condition = `${args.condition}` + this.orgCondtionStr
       }
       // args.condition = `${args.condition}` + `and f_orgid = '${this.$login.f.orgid}'`
+      this.condition2 = args.condition
       this.model.search(args.condition, args.model)
     }
 
@@ -391,15 +421,20 @@ export default {
   computed: {
     authArr () {
       return this.$login.r ? this.$login.r : []
+    },
+    getCondition () {
+      return {
+        condition: this.condition2
+      }
+    }
+  },
+  watch: {
+    sumsmodel: {
+      handler: function (val) {
+        this.getotherfooter()
+      },
+      deep: true
     }
   }
-  // watch: {
-  //   sumsmodel: {
-  //     handler: function (val) {
-  //       this.getotherfooter()
-  //     },
-  //     deep: true
-  //   }
-  // }
 }
 </script>

package/src/filiale/jingyang/wechatValidateRefund.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <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 :initres="$parent.$parent.initres" :show-component="['company']"
+                              @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+            <div class="col-sm-2  form-group">
+              <label for="startDate" class="font_normal_body">退费开始日期</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate" style="width: 60%"
+                          :value.sync="model.startDate"
+                          condition="f_delivery_date  >= '{} 00:00:00'"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2  form-group">
+              <label for="endDate" class="font_normal_body">结束日期</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate" style="width: 60%"
+                          :value.sync="model.endDate"
+                          condition="f_delivery_date <= '{} 23:59:59'"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2  form-group">
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'">
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">终端编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_num"
+                     placeholder='终端编号'
+                     condition="f_terminal_num like '%{}%'">
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+              <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                            :footer="$parent.$parent.footer"
+                            :field="$parent.$parent.getExportField"
+                            :header="$parent.$parent.other"
+                            sqlurl="rs/logic/saleExport" sql-name="wechatSelling" template-name='自助机对账退费导出'
+                            :choose-col="true"></export-excel>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.hidden()"
+                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>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                     placeholder='客户名称'
+                     condition="f_user_name = '{}'">
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;电话&nbsp;&nbsp;&nbsp;</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone" placeholder='电话'
+                     condition="f_user_phone like '{}%'">
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">客户地址</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_address" placeholder='客户地址'
+                     condition="f_address like '%{}%'">
+            </div>
+            <!--<div class="col-sm-2  form-group">-->
+            <!--<label  class="font_normal_body">订单状态</label>-->
+            <!--<v-select-->
+            <!--v-model="model.msg"-->
+            <!--placeholder='订单状态'-->
+            <!--condition="f_states like '%{}%'"-->
+            <!--:value.sync="model.msg"-->
+            <!--:options='$parent.$parent.letter'-->
+            <!--close-on-select ></v-select>-->
+            <!--</div>-->
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>客户编号</th>
+            <th>客户姓名</th>
+            <th>客户电话</th>
+            <th>客户地址</th>
+            <th>终端编号</th>
+            <th>订单号</th>
+            <th>退款金额</th>
+            <th>订单发生日期</th>
+            <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;">
+            <nobr>{{ $index + 1 }}</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_user_phone }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_address }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_terminal_num }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_transaction_id }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_total_fee }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_time_out }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_states }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_payment }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_pregas }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_collection }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_delivery_date }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_charge_state }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_write_card }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_operator }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_operate_date }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_comments }}</nobr>
+          </td>
+
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+let readyGen = async function (self) {
+  // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+  // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+
+export default {
+  title: '自助机对账',
+  data () {
+    return {
+      model: new PagedList('rs/sql/wechatSelling', 20, {}, {f_total_fee: '', f_collection: ''}),
+      criteriaShow: false,
+      show: false,
+      watchComment: '',
+      orgCondtionStr: '',
+      getfield: {},
+      // 合计数据
+      sumsmodel: {},
+      initres: {
+        org: [this.$login.f.orgid]
+      },
+      msgData: [],
+      getExportField: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_user_phone': '客户电话',
+        'f_address': '客户地址',
+        'f_meter_classify': '气表类型',
+        'f_bank_name': '缴费银行',
+        'f_terminal_num': '终端编号',
+        'f_transaction_id': '订单号',
+        'f_total_fee': '订单金额',
+        'f_time_out': '订单发生日期',
+        'f_states': '订单状态',
+        'f_payment': '付款方式',
+        'f_pregas': '购气量',
+        'f_collection': '购气金额',
+        'f_delivery_date': '系统收费时间',
+        'f_charge_state': '系统收费状态',
+        'f_write_card': '系统写卡状态',
+        'f_operator': '操作人',
+        'f_operate_date': '退款时间'
+      },
+      condition2: '',
+      other: [],
+      footer: []
+    }
+  },
+  props: [],
+  ready () {
+    readyGen(this)
+  },
+  methods: {
+    async getRes (condition, obj) {
+      this.orgCondtionStr = condition
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    updateState (val) {
+      this.show = true
+      this.msgData = val
+    },
+    close () {
+      this.show = false
+      this.watchComment = ''
+      this.msgData = []
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    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)
+    },
+    selfSearch (args) {
+      this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
+      this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
+      if (!this.orgCondtionStr) {
+        args.condition = `${args.condition}` + `and f_orgid = '${this.$login.f.orgid}'` + `and f_bill_state = '4'`
+      } else {
+        args.condition = `${args.condition}` + this.orgCondtionStr  + `and f_bill_state = '4'`
+      }
+      // args.condition = `${args.condition}` + `and f_orgid = '${this.$login.f.orgid}'`
+      this.condition2 = args.condition
+      this.model.search(args.condition, args.model)
+    }
+
+  },
+  events: {},
+  computed: {
+    authArr () {
+      return this.$login.r ? this.$login.r : []
+    },
+    getCondition () {
+      return {
+        condition: this.condition2
+      }
+    }
+  },
+  watch: {
+    sumsmodel: {
+      handler: function (val) {
+        this.getotherfooter()
+      },
+      deep: true
+    }
+  }
+}
+</script>

package/src/filiale/wuhai/CardList.vue

@@ -434,7 +434,7 @@
         } else if (type === '机表收费' || type === '机表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             if (title === '热敏收据补打') {
-              name = 'rs/report/fmy_machine_bill_thermal'
+              name = 'rs/report/machine_bill_thermal'
             } else {
               name = 'rs/report/fmy_machine_bill'
             }
@@ -448,7 +448,7 @@
         } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             if (title === '热敏收据补打') {
-              name = 'rs/report/fmy_iot_bill_thermal'
+              name = 'rs/report/iot_bill_thermal'
             } else {
               name = 'rs/report/fmy_iot_bill'
             }
@@ -478,7 +478,7 @@
         } else if (type === '发卡售气') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             if (title === '热敏收据补打') {
-              name = 'rs/report/fmy_sendCard_bill_thermal'
+              name = 'rs/report/sendCard_bill_thermal'
             } else {
               name = 'rs/report/fmy_sendCard_bill'
             }
@@ -496,7 +496,7 @@
         } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             if (title === '热敏收据补打') {
-              name = 'rs/report/fmy_card_bill_thermal'
+              name = 'rs/report/machine_bill_thermal'
             } else {
               name = 'rs/report/fmy_card_bill'
             }

package/src/filiale/wuhai/ShowCardSellGas.vue

@@ -189,6 +189,8 @@
         <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
         <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="close"
                     :data='row' @printok="printok" v-ref:printbill></print-bill>
+        <print-bill-thermal :show="print_thermal" :bill-config='config' :bill-data='billData' :data='row'
+                            @toggle="close" @printok="printok"  v-ref:printbilljs></print-bill-thermal>
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large"
@@ -375,23 +377,29 @@ let initCardGen = async function (self) {
     // 开始打票
     if (self.config.hasPrint) {
       if (self.model.f_print.indexOf('电子发票') == -1) {
-        if (self.$login.r.includes('非民用纸质票据拆分')) {
-          if (self.row.f_user_type === '非民用') {
-            self.billData.url = 'rs/report/fmy_sendCard_bill'
-          }
-        }
-        if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
-          self.billData.url = 'rs/report/fee_sendCard_bill'
-        }
-        if (self.config.hasBillManage) {
-          // 启用发票管理，获取票据管理中的票号并存储记录 d
+        if (self.model.f_print[0] == '热敏收据') {
+          self.billData.url = 'rs/report/sendCard_bill_thermal'
           self.row.id = res.data.id
-          self.row.f_bill_type = '发卡售气'
-          self.row.f_bill_style = self.model.f_print[0]
-          self.print = true
+          self.print_thermal = true
         } else {
-          self.row.id = res.data.id
-          self.print = true
+          if (self.$login.r.includes('非民用纸质票据拆分')) {
+            if (self.row.f_user_type === '非民用') {
+              self.billData.url = 'rs/report/fmy_sendCard_bill'
+            }
+          }
+          if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
+            self.billData.url = 'rs/report/fee_sendCard_bill'
+          }
+          if (self.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录 d
+            self.row.id = res.data.id
+            self.row.f_bill_type = '发卡售气'
+            self.row.f_bill_style = self.model.f_print[0]
+            self.print = true
+          } else {
+            self.row.id = res.data.id
+            self.print = true
+          }
         }
       } else {
         if (self.model.f_print[0] === '电子发票') {
@@ -496,6 +504,7 @@ export default {
         f_privilege_money: 0,
         f_after_discount: 0
       },
+      print_thermal: false,
       cardallot: null,
       calculatedetail: '',