sale-client 4.2.37 → 4.2.39

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Oct 23 13:32:43 CST 2024
+#Thu Sep 04 15:35:12 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -742,12 +742,11 @@ let loadParamGem = async function (self) {
       },
       goChargeManage () {
         try {
-          this.$goto('charge-manage', {f: this.$login.f}, 'main')
-          this.$showAlert(`请根据客户编号重新查询后，再进行业务操作！`, 'warning', 3000)
-        } catch (e) {
-        }
-        try {
-          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
+          if (window.parent !== window) {
+            window.parent.postMessage({type: 'route', path:'/chargeMange/charge-manage'}, '*')
+          } else {
+            this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          }
         } catch (e) {
         }
       },

package/src/components/charge/bzjcancel.vue

@@ -38,6 +38,17 @@
           </div>
         </div>
         <div class="row" style="margin-top:10px;" v-if="model.f_type == '卡表退费'">
+          <div class="col-sm-4 form-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+            <v-select id="print"
+                      v-model="model.f_print"
+                      style="width:60%"
+                      placeholder='请选择'
+                      :value.sync="model.f_print"
+                      :options='printstyle'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
           <div class="col-sm-4 form-group" :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
             <label for="f_pregas" class="font_normal_body">退费气量</label>
             <input  class="input_search" style="width:60%" type="number"
@@ -61,7 +72,8 @@
         <button class="button_clear btn-gn" @click="clean()">取消</button>
       </div>
     </validator>
-    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <validate-bill v-if="hasValidateBill" :data="row" @validate-bill="validateBill"></validate-bill>
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' @toggle="clean" @printok="printok" :data='row' v-ref:printbill></print-bill>
     <modal :show.sync="modalShow" v-ref:modalShow backdrop="false">
       <article slot="modal-body" class="modal-body">
         <div class="modal_class flex">
@@ -109,6 +121,13 @@
 
 
 <script>
+  let readyGen = async function (self) {
+    await self.$getConfig(self, 'OtherRefundConfig')
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+    self.hasValidateBill = self.config.hasBillManage
+    console.log('其他退费config', self.config, self.model)
+  }
   export default {
     title: '退保证金',
     data () {
@@ -116,9 +135,17 @@
         model: {
           f_refund_fee: '',
           f_comments: '',
+          f_print: '',
+          f_payment: '',
           f_price: 0,
           f_pregas: 0
         },
+        config: {
+          hasPrint: false,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          printType: '普通收据',
+          payment: '现金缴费'
+        },
         dis: false,
         blodid: '',
         hasValidateBill: false,
@@ -142,11 +169,13 @@
         modalData: {
           rows: []
         },
-        modalShow: false
+        modalShow: false,
+        printstyle: this.$appdata.getParam('打印格式')
       }
     },
     props: ['row'],
     ready () {
+      readyGen(this)
     },
     watch: {
       async 'model.f_type' (val) {
@@ -279,12 +308,36 @@
           } else {
             url = 'api/af-revenue/logic/yajincancel'
           }
-          await this.$resetpost(url, {data: param}, {
+          let res = await this.$resetpost(url, {data: param}, {
             warnMsg: `确定要进行${this.model.f_type}操作吗？`,
             resolveMsg: `${this.model.f_type}操作成功！！`,
             rejectMsg: `${this.model.f_type}操作失败！！请重试！！`
           })
-          this.$dispatch('success')
+          if (this.model.f_type == '卡表退费') {
+            if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint) {
+              console.log('this.config.hasBillManage', this.config.hasBillManage)
+              if (this.config.hasBillManage) {
+                // 启用发票管理，获取票据管理中的票号并存储记录
+                this.row.id = res.data.id
+                this.row.f_bill_type = '卡表退费'
+                this.row.f_bill_style = this.model.f_print[0]
+                this.print = true
+              } else {
+                this.row.id = res.data.id
+                this.print = true
+              }
+            } else if (this.config.printType === '国税发票') {
+              // TODO
+              this.$dispatch('success')
+            } else if (this.config.printType === '电子发票') {
+              // TODO
+              this.$dispatch('success')
+            } else {
+              this.$dispatch('success')
+            }
+          } else {
+            this.$dispatch('success')
+          }
         }
       },
       clean () {

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

@@ -340,7 +340,7 @@
             }
           }
           if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
-            let table_name = this.$appdata.getSingleValue('新抄表')? 't_web_handplan' : 't_handplan'
+            let table_name = this.$appdata.getSingleValue('新抄表') ? 't_web_handplan' : 't_handplan'
             let getWebHand = await this.$SqlService.singleTable(table_name, `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_userfiles_id = '${row.f_userfiles_id}'`)
             console.log('长度', getWebHand)
             if (getWebHand.data.length > 0) {
@@ -474,7 +474,7 @@
           name = 'api/af-revenue/report/pre_sell'
         } else if (type === '调价预存') {
           name = 'api/af-revenue/report/refund_sell'
-        } else if (type === '退费') {
+        } else if (type === '退费' || type === '卡表退费') {
           name = 'api/af-revenue/report/refund_sell'
         } else if (type === '调价补费') {
           name = 'api/af-revenue/report/compensation_bill'

package/src/filiale/jinhong/CardList.vue

@@ -340,7 +340,7 @@
             }
           }
           if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
-            let table_name = this.$appdata.getSingleValue('新抄表')? 't_web_handplan' : 't_handplan'
+            let table_name = this.$appdata.getSingleValue('新抄表') ? 't_web_handplan' : 't_handplan'
             let getWebHand = await this.$SqlService.singleTable(table_name, `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_userfiles_id = '${row.f_userfiles_id}'`)
             console.log('长度', getWebHand)
             if (getWebHand.data.length > 0) {
@@ -474,7 +474,7 @@
           name = 'api/af-revenue/report/pre_sell'
         } else if (type === '调价预存') {
           name = 'api/af-revenue/report/refund_sell'
-        } else if (type === '退费') {
+        } else if (type === '退费' || type === '卡表退费') {
           name = 'api/af-revenue/report/refund_sell'
         } else if (type === '调价补费') {
           name = 'api/af-revenue/report/compensation_bill'

package/src/filiale/jinhong/GarbageCharge.vue

@@ -73,6 +73,7 @@ let loadGen = async function (self) {
     let owes = res.data
     self.refreshCenter(owes)
   }
+  console.log('垃圾费收费config', self.config, self.model)
 }
 /**
  *售气收费
@@ -91,13 +92,13 @@ export default {
         payment: '现金',
         billType: '燃气费'
       },
-      print:false,
+      print: false,
       paytype: this.$appdata.getParam('付款方式'),
       printstyle: this.$appdata.getParam('打印格式'),
       printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
       garbagelist: [],
       billData: {
-        url: 'api/af-revenue/report/sendCard_bill',
+        url: 'api/af-revenue/report/garbageChargeReport',
         bill: ''
       },
       garbagefee: 0,
@@ -109,7 +110,7 @@ export default {
       chargeView: false
     }
   },
-  props: ['row','cardData'],
+  props: ['row', 'cardData'],
   ready () {
     this.initData(this.row)
     this.blodid = this.row.f_userinfo_id
@@ -152,11 +153,9 @@ export default {
             this.row.id = res.data.recordId
             this.row.f_bill_type = '垃圾费'
             this.row.f_bill_style = this.model.f_print
-            this.billData.url = 'api/af-revenue/report/garbageChargeReport'
             this.print = true
           } else {
             this.row.id = res.data.recordId
-            this.billData.url = 'api/af-revenue/report/garbageChargeReport'
             this.print = true
           }
         } else if (this.config.printType === '国税发票') {