sale-client 3.6.184 → 3.6.185

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -213,6 +213,7 @@
       },
       async chargecal (row) {
         let param = {
+          f_operator: Vue.$login.f.name,
           f_sell_id: row.maxid,
           f_cancel_reason: '',
           f_orgid: Vue.$login.f.orgid,

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -148,7 +148,7 @@
         </data-grid>
       </criteria-paged>
       <print-data :sum-field="getfield" :model="printModel" :thead="getHead"
-                  :starthead="starthead"
+                  :starthead="getStarthead"
                   :field="getfield" :printview="true"
                   :sumsmodel="{'f_oughtfee':printModel.sums.f_oughtfee}"
                   :defaultfield="defaultfield"
@@ -263,6 +263,12 @@ export default {
     },
     getHead () {
       return `团缴号：${this.row.f_customer}`
+    },
+    getStarthead () {
+      return `<div style="display: inline-block;width: 100%;">
+                          <div style="text-align: left;display: inline-block;width: 49%;float: left;">&nbsp;团缴编号: ${this.row.f_customer}</div>
+                          <div style="text-align: right;display: inline-block;width: width: 49%;float: right;">总欠费金额: ${this.row.f_oughtfee_all}元&nbsp;</div>
+              </div>`
     }
   },
   watch: {
@@ -338,10 +344,6 @@ export default {
       this.row = row
       let condition = `p.f_civill_id = ${row.id}`
       await this.printModel.search(condition)
-      this.starthead = `<div style="display: inline-block;width: 100%;">
-                          <div style="text-align: left;display: inline-block;width: 49%;float: left;">&nbsp;团缴编号: ${row.f_customer}</div>
-                          <div style="text-align: right;display: inline-block;width: width: 49%;float: right;">总欠费金额: ${row.f_oughtfee_all}元&nbsp;</div>
-                        </div>`
       this.$refs.printdata.printData()
     },
     // 导出
@@ -349,7 +351,6 @@ export default {
       this.row = row
       this.getotherfooter(row)
       this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
-      this.starthead = `团缴编号: ${row.f_customer},总欠费金额: ${row.f_oughtfee_all}元`
       this.excelhead = []
       let headData = []
       headData.push(this.starthead)