sale-client 3.6.156 → 3.6.158

package/package.json

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

package/src/components/chargeBatch/BatchCharge.vue

@@ -291,7 +291,7 @@ export default {
         let batch = await this.$resetpost('rs/logic/asyncbatchPaymentSellinggas', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
         batchId = param.f_batch_id = batch.data.f_batch_id
         // 处理记录明细抄表明细
-        await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        // await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
       } else {
         try {
           await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)

package/src/components/chargeBatch/ReissueBillBatch.vue

@@ -62,14 +62,10 @@
           for (let row of this.sellingData) {
             let bill = await this.$resetpost(this.data.billUrl, {data: {condition: row.id, operator: `'${this.data.f_operator}'`}}, {resolveMsg: null})
             this.bill.data = bill.data
-            await new Promise(resolve => {
-              this.$nextTick(() => {
-                setTimeout(() => {
-                  // 在延迟后执行打印操作
-                  this.asyncPrint(select)
-                  resolve()
-                }, parseInt(this.timeOut)) // 延迟1秒钟打印下一张票据，可以根据需要调整延迟时间
-              })
+            this.$nextTick(function () {
+              setTimeout(function () {
+                this.asyncPrint(select)
+              }, parseInt(this.timeOut)) // 延迟时间从this.timeOut中获取，需要确保timeOut是一个数字值
             })
             this.printControl = null
           }

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -115,7 +115,6 @@
         }, ...this.$appdata.getParam('是否有效')] : [],
         // row数据
         rowsdata: [],
-        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
@@ -131,7 +130,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_ChangeMeterQuery', {

package/src/components/revenue/comprehen/gasbrand/GasBrandUser.vue

@@ -19,7 +19,7 @@
               <export-excel
                 :data="{condition: $parent.$parent.condition}"
                 :field="$parent.$parent.getfield"
-                sqlurl="rs/logic/exportfile" sql-name="salegetGasUser" :template-name="$parent.$parent.meterbrand+'气价使用人'"
+                sqlurl="rs/logic/saleExport" sql-name="getGasBrandsUser" :template-name="$parent.$parent.meterbrand+'气价使用人'"
                 :choose-col="true"></export-excel>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_top': $parent.$parent.criteriaShow2,'button_shrink_bottom': !$parent.$parent.criteriaShow2}"
@@ -93,11 +93,12 @@
         pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
         config: {
           excelHeaders: {
-            'f_price_name': '气价名称',
             'f_userinfo_code': '客户编号',
+            'f_meternumber': '表号',
+            'f_meter_brand': '气表品牌',
+            'f_meter_type': '气表类型',
             'f_user_name': '客户姓名',
-            'f_address': '客户地址',
-            'f_orgname': '组织机构'
+            'f_address': '客户地址'
           }
         },
         checked1: true,

package/src/filiale/alashan/EticketManage.vue

@@ -0,0 +1,60 @@
+<template>
+  <tab-button v-ref:list>
+    <tabs header="开票记录">
+      <e-ticket-record-list></e-ticket-record-list>
+    </tabs>
+<!--    <tabs header="物联网表结算">-->
+<!--      <e-ticket-open-iot></e-ticket-open-iot>-->
+<!--    </tabs>-->
+<!--    <tabs header="卡表结算">-->
+<!--      <e-ticket-open-card></e-ticket-open-card>-->
+<!--    </tabs>-->
+<!--    <tabs header="抄表结算">-->
+<!--      <e-ticket-open-hand></e-ticket-open-hand>-->
+<!--    </tabs>-->
+    <tabs header="自定义开票">
+      <cust-query-eticket></cust-query-eticket>
+    </tabs>
+  </tab-button>
+</template>
+
+<script>
+import TabButton from '../../components/revenue/comprehen/common/TabButton'
+import Tabs from '../../components/revenue/comprehen/common/Tabs'
+export default {
+  name: 'eticket',
+  title: '发票管理',
+  components: { Tabs, TabButton },
+  data () {
+    return {// 页面开关
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [true]
+    }
+  },
+  ready () {},
+  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/alashan/sale.js

@@ -12,4 +12,7 @@ export default function () {
   // 票据补打
   Vue.component('reissue-bill', (resolve) => { require(['./ReissueBill'], resolve) })
   Vue.component('file-user-device-info', (resolve) => { require(['./UserDeviceInfoTest'], resolve) })
+
+  // 电子发票管理
+  Vue.component('e-ticket-manage', (resolve) => { require(['./EticketManage'], resolve) })
 }

package/src/filiale/qianneng/revenue/common/ic_detail/ChargeQueryUser.vue

@@ -67,7 +67,7 @@
               <th><nobr>违约金</nobr></th>
               <th><nobr>减免金额</nobr></th>
               <th><nobr>上期结余</nobr></th>
-              <th><nobr v-if="!$parent.$parent.$parent.isIot">应交金额</nobr></th>
+              <th v-if="!$parent.$parent.$parent.isIot"><nobr >应交金额</nobr></th>
               <th><nobr>实收金额</nobr></th>
               <th><nobr>本期结余</nobr></th>
               <th><nobr>付款方式</nobr></th>