sale-client 3.6.260-test → 3.6.261-test

package/package.json

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

package/src/components/charge/business/ShowCardSellGas.vue

@@ -163,9 +163,9 @@
               <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
-            <div class="col-sm-4" v-if="model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <div class="col-sm-4" v-if="model.f_payment == '银行转账'" >
               <label for="f_serial_number" class=" font_normal_body">银行流水</label>
-              <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
+              <input class="input_search" style="width:60%"  type="text"
                      v-model="model.f_serial_number" placeholder="银行流水">
             </div>
 

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -160,7 +160,7 @@
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="openUser">开户</button>
-      <button v-if="row.f_meter_type.includes('物联网表')"
+      <button v-if="row.f_meter_type.includes('物联网表') && valveLimit"
               class="button_search" type="button" @click="valvecontrol">开关阀</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="zdfk">开关自动阀控</button>

package/src/filiale/lixianV3/iotHand.vue

@@ -68,6 +68,10 @@
                   @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
               </div>
 
+            <export-excel :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getfield"
+                          sqlurl="rs/logic/saleExport" sql-name="getIotHand" template-name='泰鹏抄表导出'
+                          :choose-col="true"></export-excel>
             <div class="row" v-show="$parent.$parent.criteriaShow">
 
 
@@ -255,7 +259,20 @@ export default {
       orderFields: {
         f_userinfo_id: 'no'
       },
-      getfield: {},
+      getfield: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_address': '客户地址',
+        'f_user_phone': '用户电话',
+        'f_idnumber': '身份证号',
+        'f_card_id': '卡号',
+        'f_meternumber': '表号',
+        'f_table_state': '表具状态',
+        'f_meter_base': '上期底数',
+        'f_tablebase': '本期底数',
+        'f_last_input_date': '最近一次抄表时间',
+        'f_inputtor': '抄表员'
+      },
       outlet: '',
       filiale: '',
       condition2: '',

package/src/filiale/tongchuan/bill/EticketOpenJBPage.vue

@@ -291,7 +291,8 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.row.id, this.row, '机表结算')
+      console.log('>>> 机表结算开票')
+      this.$refs.eticketbill.openETicket(this.row.id, this.row, this.invoice_show_gas, this.invoice_is_pax, '机表结算')
     },
     selfSearch (args) {
       this.selecteds = []

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -56,6 +56,7 @@ export default {
       await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
     },
     async openETicket (sellId, row, show_gas, is_pax, type, invoice_kind = '电子发票', retry = false) {
+      console.log('>>> 看看 openETicket 的参数是什么', sellId, row, show_gas, is_pax, type, invoice_kind, retry)
       try {
         let model = {
           id: sellId,

package/src/filiale/tongchuan/sale.js

@@ -130,6 +130,8 @@ export default function () {
   // 抄表列表
   Vue.component('hand-list', (resolve) => { require(['./handList'], resolve) })
   Vue.component('e-ticket-open-hand', (resolve) => { require(['./EticketOpenJBPage.vue'], resolve) })
+  // 电子发票管理
+  Vue.component('e-ticket-manage-query-v4', (resolve) => { require(['./EticketManage'], resolve) })
   // 物联网表结算
   Vue.component('e-ticket-open-iot-query-v4', (resolve) => { require(['./bill/EticketOpenPage'], resolve) })
   // 卡表结算