lilei 2 tahun lalu
induk
melakukan
81604fb628

+ 1 - 1
src/libs/JGPrint.js

@@ -185,7 +185,7 @@ export const jGPlPrint = function (data, type, callback, printLogParams, orginDa
   // 循环页
   for(var i=0;i<data.length;i=i+2){
      if(i%2==0){
-       LODOP.NewPageA();
+       LODOP.NewPage();
      }
      LODOP.ADD_PRINT_HTM(0, 0, '100%', '99%', data[i]+(data[i+1]||''))
   }

+ 2 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -141,7 +141,8 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
-        { title: '所属区域', dataIndex: 'subareaNames', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '所属区域', dataIndex: 'subareaName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaAreaName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text||text==0)?_this.toThousands(text):'--' } },

+ 8 - 17
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -150,8 +150,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaSnList: undefined, //  所属区域
-        subareaNameList: undefined,
+        subareaSn: undefined, //  所属区域
+        subareaName: undefined,
+        subareaAreaSn: undefined, // 分区
         provinceSn: undefined, // 省份
         provinceName: '',
         citySn: undefined, // 市
@@ -188,19 +189,14 @@ export default {
           this.form.citySn = row.citySn
           this.form.provinceName = row.provinceName
           this.form.cityName = row.cityName
-          if (row.subareaNameSet) {
-            const a = row.subareaNameSet.filter(item => item !== '中国')
-            this.form.subareaNameList = [a[0]]
-            this.form.subareaSnList = [this.$refs.subareaBox.getValByName(this.form.subareaNameList)[0]]
-          }
+          this.form.subareaSn = row.subareaSn
+          this.form.subareaAreaSn = row.subareaAreaSn
         } else {
           this.form.accountNameSn = ''
           this.form.provinceSn = ''
           this.form.citySn = ''
           this.form.provinceName = ''
           this.form.cityName = ''
-          this.form.subareaNameList = ''
-          this.form.subareaSnList = ''
           this.form.subareaSn = ''
           this.form.subareaAreaSn = ''
           this.$refs.subareaBox.clearData()
@@ -212,7 +208,6 @@ export default {
     },
     // 分区
     subareaChange(val, row){
-      this.form.subareaName = row.subareaName
       this.form.subareaSn = val[0] ? val[0] : undefined
       this.form.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -287,13 +282,9 @@ export default {
           form.citySn = form.citySn ? form.citySn : ''
           form.cityName = form.cityName ? form.cityName : ''
           form.expense = Math.abs(form.expense)
-          // 不是数组
-          if (!Array.isArray(form.subareaSnList)) {
-            form.subareaSnList = [form.subareaSnList]
-          }
+          
           console.log(form)
-          delete form.subareaNames
-          delete form.subareaSns
+        
           _this.spinning = true
           expenseAcctDetailSave(form).then(res => {
             if (res.status == 200) {
@@ -315,6 +306,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.ruleForm.resetFields()
         this.$refs.city.clearData()
+        this.$refs.subareaBox.clearData()
       })
       this.form = {
         id: undefined,
@@ -340,7 +332,6 @@ export default {
       this.form.cityName = ''
       this.form.expenseAccountSn = this.expenseAccountSn
       this.form.expenseAccountNo = this.expenseAccountNo
-      this.$refs.subareaBox.clearData()
     }
   },
   watch: {

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

@@ -162,13 +162,13 @@ export default {
       for (let i = 0; i < printCons.length; i++) {
         if (printCons[i].h > 560) {
           htmlStr.push('')
-        }else{
-          printCons[i].t = '<div style="height:535px;">' +printCons[i].t+'</div>'
         }
+        printCons[i].t = '<div style="height:530px;margin:0 auto;">' +printCons[i].t+'</div>'
         htmlStr.push(printCons[i].t)
       }
       this.$store.state.app.curActionPermission = 'B_eRPrint'
       // html, type, callback, printLogParams
+      // console.log(htmlStr)
       jGPlPrint(htmlStr, 'preview', function (res) {
         _this.$store.state.app.curActionPermission = ''
         _this.$emit('printOk', res)

+ 1 - 1
src/views/salesManagement/sendOutOrder/list.vue

@@ -220,7 +220,7 @@ export default {
         { title: '地区', dataIndex: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流电话', dataIndex: 'transportTele', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流单号', dataIndex: 'transportNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总件数', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },