Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-basic-data/pages/draw-bill/add/add.js

@@ -96,6 +96,7 @@ Page({
             title: '提交',
             width: '120rpx',
         }],
+        receiptSetService: app.globalData['receiptSetService'], //发票抬头 
         receiptFitService: app.globalData['receiptFitService'], //发票设置
         // 路由
         routeObjName: 'receipt',
@@ -115,7 +116,7 @@ Page({
             tradeList: tradeList,
         })
         this.getReceiptFit()
-
+        this.getReceiptSit()
     },
     /**
      * @desc : 获取开票设置
@@ -124,10 +125,11 @@ Page({
      */
     getReceiptFit() {
         let that = this
-        that.excute(that.data.receiptFitService, that.data.receiptFitService.selectByCond, {
-            flgDefault: true
-        }).then(res => {
-            if (res.data.code == 200) {
+        let  params = {}
+        params.flgDefault = true
+        params.cpId = app.globalData.user.cpId
+        that.excute(that.data.receiptFitService, that.data.receiptFitService.selectByCond,params).then(res => {
+            if (res.data.code == 200) { 
                 let formData = JSON.parse(that.data.formData)
                 if (res.data.data && res.data.data.length > 0) {
                     formData.fitId = res.data.data[0].fitId
@@ -135,9 +137,34 @@ Page({
                     formData.receiptObj = res.data.data[0].receiptObj
                     formData.receiptStaff = res.data.data[0].receiptStaff
                     formData.taxRateNormal = res.data.data[0].taxRateNormal
-                    formData.taxRateSpecial = res.data.data[0].taxRateSpecial
-                }
-
+                    formData.taxRateSpecial = res.data.data[0].taxRateSpecial 
+                } 
+                //设置默认值
+                that.setData({
+                    formData: JSON.stringify(formData)
+                })
+            }
+        })
+    },
+      /**
+     * @desc : 获取默认发票抬头
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
+     */
+    getReceiptSit() {
+        let that = this
+        that.excute(that.data.receiptSetService, that.data.receiptSetService.selectByCond, {
+            flgDefault: true
+        }).then(res => {
+            if (res.data.code == 200) {
+                let formData = JSON.parse(that.data.formData)
+                if (res.data.data && res.data.data.length > 0) { 
+                    formData.cpId =res.data.data[0].cpId
+                    formData.cpName =res.data.data[0].cpName
+                    formData.setId =res.data.data[0].setId
+                    formData.taxNo = res.data.data[0].taxNo
+                    formData.cpEmail = res.data.data[0].cpEmail
+                } 
                 //设置默认值
                 that.setData({
                     formData: JSON.stringify(formData)

package-basic-data/pages/draw-bill/draw-bill.js

@@ -36,7 +36,7 @@ Page({
                 type: 'amount'
             },
             {
-                name: 'integral',
+                name: 'integralName',
                 title: mixins.$t('usingCloudCoins')
             },
             {
@@ -93,7 +93,7 @@ Page({
         let temp = tableData
         temp.forEach(it => {
             it.tradeTime = this.formatDateOnly(it.tradeTime)
-            it.integral = it.integral + "枚"
+            it.integralName = it.integral + "枚"
             it.receiptStatusName = it.receiptStatusName?it.receiptStatusName:'未开票'
         })
         this.setData({