lilei 2 лет назад
Родитель
Сommit
c3218161d7

+ 12 - 3
src/libs/JGPrint.js

@@ -143,20 +143,29 @@ export const jGPrint = function (data, type, callback, printLogParams, printPage
 }
 
 // 自动排版, 遍历数组,将数组中每一个数值加起来,如果和小于某个数,则将这些数值存放到一个新数组中。
-export const groupLessThan = function(html) {
-  const pageMidHeight = 535 // 半页高度
+export const groupLessThan = function(html,isNoMerge) {
+  const pageMidHeight = 530 // 半页高度
   const pageHeight = pageMidHeight*2 // 页高度
   const arr = []
   const result = []
   for (let i = 0; i < html.length; i++) {
     const h = html[i].clientHeight // 总高度
     const pz = h<=pageMidHeight ? '0.5' : (h/pageHeight).toFixed(2) // 页数
+    const t = '<div style="height:'+(pz<=0.5?pageMidHeight:'auto')+'px'+';border:1px solid #fff;">'+html[i].innerHTML+'</div>'
     arr.push({
       h: h,
       pz: pz,
-      t: '<div style="height:'+(pz<=0.5?pageMidHeight:'auto')+'px'+';border:1px solid #fff;">'+html[i].innerHTML+'</div>',
+      t: t,
       flag: 0
     })
+    // 不合并纸张打印
+    if(isNoMerge){
+      result.push(t)
+    }
+  }
+  // 不合并纸张打印
+  if(isNoMerge){
+    return result
   }
   console.log(arr)
    // 找出所有小于半张纸的

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/previewModal.vue

@@ -144,7 +144,7 @@ export default {
       const _this = this
       const html = document.getElementsByClassName('expense-detail-print')
       // 自动排版
-      const result = groupLessThan(html)
+      const result = groupLessThan(html,true)
       this.$store.state.app.curActionPermission = 'B_eRPrint'
       // html, type, callback, printLogParams
       jGPlPrint(result, 'print', function (res) {

+ 1 - 1
src/views/reportData/salesAmountReport/list.vue

@@ -258,7 +258,7 @@ export default {
       this.queryParam.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
-      this.queryParam.subarea.bizUserSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       this.$refs.subarea.clearData()

+ 1 - 0
src/views/reportData/salesDetails/list.vue

@@ -336,6 +336,7 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined

+ 1 - 0
src/views/reportData/salesReturnDetailReport/list.vue

@@ -231,6 +231,7 @@ export default {
       const arr = [
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 1
src/views/salesManagement/receiptPrint/printModel.vue

@@ -106,7 +106,7 @@ export default {
     handleCommonOk () {
       const _this = this
       const html = document.getElementsByClassName('sendGood-print-box')
-      const result = groupLessThan(html)
+      const result = groupLessThan(html, false)
       this.$store.state.app.curActionPermission = 'B_SkPrint'
       // html, type, callback, printLogParams
       this.spinning = true

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/ocs-admin',
+        target: 'http://192.168.2.117/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {