修改bug

src/enums/column-name.js

@@ -560,7 +560,7 @@ const columnName = [{
   {
     code: 145,
     name: '客户资料-收发货地址'
-  }, 
+  },
   {
     code: 146,
     name: '供应商资料-列表'
@@ -612,7 +612,11 @@ const columnName = [{
   {
     code: 158,
     name: '入职审批列表'
-  }
+  },
+  {
+    code: 159,
+    name: '统计分析销售对账明细'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/router/views/index.js

@@ -178,7 +178,7 @@ export default [{
       },
       component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/customerInformation/index')
     }]
-  },//车队资料
+  }, //车队资料
   {
     path: '/basicData/fleetInformation/index',
     component: Layout,
@@ -1380,6 +1380,21 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/salesReconciliation/index')
     }]
   },
+  //销售对账详情
+  {
+    path: '/statisticAnalysis/salesReconciliationDetails/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/statisticAnalysis/salesReconciliationDetails/index',
+      name: '销售对账详情',
+      meta: {
+        i18n: '/statisticAnalysis/salesReconciliationDetails/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/salesReconciliationDetails/index')
+    }]
+  },
   //应收总账
   {
     path: '/statisticAnalysis/collectLedger/index',

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "addBtn": false,
   "delBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 120,
   "refreshBtn": false,
   "showSummary": true,
@@ -68,6 +68,7 @@
       "prop": "purchaseCost",
       "index": 8,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -75,6 +76,7 @@
       "prop": "purchaseAmount",
       "index": 9,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -89,6 +91,7 @@
       "prop": "partsCost",
       "index": 11,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -96,6 +99,7 @@
       "prop": "partsPrice",
       "index": 12,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -132,6 +136,7 @@
       "prop": "productPrice",
       "index": 17,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -139,6 +144,7 @@
       "prop": "price",
       "index": 18,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -146,6 +152,7 @@
       "prop": "itemMargin",
       "index": 19,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -167,6 +174,7 @@
       "prop": "orderQuantity",
       "index": 21,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -174,6 +182,7 @@
       "prop": "insurance",
       "index": 22,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -181,6 +190,7 @@
       "prop": "freight",
       "index": 23,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -188,6 +198,7 @@
       "prop": "discount",
       "index": 24,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -195,6 +206,7 @@
       "prop": "amount",
       "index": 25,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -202,6 +214,7 @@
       "prop": "taxRate",
       "index": 26,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/customerInquiry/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "70",
   "showSummary": true,
   "searchIcon": true,
@@ -142,6 +142,7 @@
       "prop": "orderQuantity",
       "index": 14,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -149,6 +150,7 @@
       "prop": "grossProfit",
       "index": 15,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -156,6 +158,7 @@
       "prop": "grossProfitRate",
       "index": 16,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -163,6 +166,7 @@
       "prop": "amount",
       "index": 17,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -170,6 +174,7 @@
       "prop": "purchaseAmount",
       "index": 18,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -777,6 +777,8 @@ export default {
           {
             label: "条款说明",
             prop: "priceTermsDescription",
+            type: "textarea",
+            minRows: 2,
             span: 16
           },
           {
@@ -793,12 +795,14 @@ export default {
           {
             label: "收款说明",
             prop: "paymentTypeDescription",
+            type: "textarea",
+            minRows: 2,
             span: 16
           },
           {
             label: "报价日期",
             prop: "businesDate",
-            span: 8,
+            span: 6,
             // type: "date",
             // format: "yyyy-MM-dd",
             // valueFormat: "yyyy-MM-dd 00:00:00",
@@ -813,7 +817,7 @@ export default {
           {
             label: "有效日期",
             prop: "dateValidity",
-            span: 8,
+            span: 6,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00",
@@ -826,14 +830,9 @@ export default {
             ]
           },
           {
-            label: "报价单号",
-            prop: "orderNo",
-            span: 8
-          },
-          {
             label: "币别",
             prop: "currency",
-            span: 8,
+            span: 6,
             rules: [
               {
                 required: true,
@@ -845,8 +844,8 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            span: 8,
-            row: true,
+            span: 6,
+
             rules: [
               {
                 required: true,
@@ -856,52 +855,59 @@ export default {
             ]
           },
           {
+            label: "报价单号",
+            prop: "orderNo",
+            row: true,
+            span: 6
+          },
+          {
             label: "箱型",
             prop: "boxPile",
-            span: 8
+            span: 6
           },
           {
             label: "箱量",
             prop: "boxNumber",
-            span: 8
+            span: 6
           },
           {
             label: "起订量",
             prop: "minOrder",
-            span: 8
+            span: 6
           },
           {
             label: "预计海运费",
             prop: "predictOceanFreight",
-            span: 8
+            span: 6
           },
           {
             label: "参考海运费",
             prop: "referenceOceanFreight",
-            span: 8
+            span: 6
           },
           {
             label: "实际海运费",
             prop: "oceanFreight",
-            span: 8
+            span: 6
           },
           {
             label: "产品毛利",
             prop: "grossProfit",
-            span: 8,
+            span: 6,
             disabled: true
           },
           {
             label: "产品利率",
             prop: "grossProfitRate",
-            span: 8,
+            span: 6,
             append: "%",
             disabled: true
           },
           {
             label: "单票毛利",
             prop: "singleTicketMargin",
-            span: 8,
+            span: 6,
+            row: true,
             disabled: true
           },
           {

src/views/exportTrade/invoice/config/customerContact.json

@@ -5,7 +5,7 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 130,
   "refreshBtn": false,
   "delBtn":false,

src/views/exportTrade/invoice/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "70",
   "searchLabelWidth": "90",
   "showSummary": true,

src/views/exportTrade/purchaseContract/config/customerContact.json

@@ -8,7 +8,7 @@
   "editBtn": false,
   "addBtn": false,
   "delBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 130,
   "refreshBtn": false,
   "selection": true,
@@ -75,6 +75,7 @@
       "prop": "orderQuantity",
       "index": 8,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -82,6 +83,7 @@
       "prop": "actualQuantity",
       "index": 9,
       "width": 120,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -111,6 +113,7 @@
       "prop": "taxRate",
       "index": 12,
       "width": 100,
+      "align": "right",
       "overHidden": true,
       "cell": true
     },
@@ -119,6 +122,7 @@
       "prop": "price",
       "index": 13,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -126,6 +130,7 @@
       "prop": "amount",
       "index": 14,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/purchaseContract/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "80",
   "searchLabelWidth": "90",
   "searchIcon": true,
@@ -83,6 +83,7 @@
       "prop": "purchaseAmount",
       "index": 7,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -90,6 +91,7 @@
       "prop": "orderQuantity",
       "index": 8,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -97,6 +99,7 @@
       "prop": "",
       "index": 9,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -104,6 +107,7 @@
       "prop": "actualQuantity",
       "index": 10,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/purchaseInquiry/config/customerContact.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "addBtn": false,
   "delBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 130,
   "refreshBtn": false,
   "showSummary": true,

src/views/exportTrade/purchaseInquiry/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "120",
   "searchIcon": true,
   "searchIndex": 2,

src/views/exportTrade/receipt/config/customerContact.json

@@ -6,7 +6,7 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 130,
   "refreshBtn": false,
   "delBtn":false,
@@ -75,6 +75,7 @@
       "prop": "actualQuantity",
       "index": 9,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -96,6 +97,7 @@
       "prop": "price",
       "index": 11,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -103,6 +105,7 @@
       "prop": "contractAmount",
       "index": 12,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -110,6 +113,7 @@
       "prop": "taxRate",
       "index": 13,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/receipt/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "80",
   "searchLabelWidth": "90",
   "showSummary": true,

src/views/exportTrade/salesContract/config/customerContact.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "addBtn": false,
   "delBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 120,
   "refreshBtn": false,
   "showSummary": true,
@@ -70,6 +70,7 @@
       "prop": "purchaseCost",
       "index": 8,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -77,6 +78,7 @@
       "prop": "purchaseAmount",
       "index": 9,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -91,6 +93,7 @@
       "prop": "partsCost",
       "index": 11,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -98,6 +101,7 @@
       "prop": "partsPrice",
       "index": 12,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -134,6 +138,7 @@
       "prop": "price",
       "index": 17,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -141,6 +146,7 @@
       "prop": "itemMargin",
       "index": 18,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -162,6 +168,7 @@
       "prop": "orderQuantity",
       "index": 20,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -169,6 +176,7 @@
       "prop": "actualQuantity",
       "index": 21,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -176,6 +184,7 @@
       "prop": "insurance",
       "index": 22,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -183,6 +192,7 @@
       "prop": "freight",
       "index": 23,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -190,6 +200,7 @@
       "prop": "discount",
       "index": 24,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -197,6 +208,7 @@
       "prop": "amount",
       "index": 25,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -204,6 +216,7 @@
       "prop": "taxRate",
       "index": 26,
       "width": 100,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/salesContract/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "70",
   "searchIcon": true,
   "searchIndex": 2,
@@ -97,6 +97,7 @@
       "prop": "minOrder",
       "index": 8,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -104,6 +105,7 @@
       "prop": "predictOceanFreight",
       "index": 8,
       "minWidth": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -111,6 +113,7 @@
       "prop": "referenceOceanFreight",
       "index": 8,
       "minWidth": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -118,6 +121,7 @@
       "prop": "oceanFreight",
       "index": 8,
       "minWidth": 100,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -164,6 +168,7 @@
       "prop": "orderQuantity",
       "index": 12,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -171,6 +176,7 @@
       "prop": "actualQuantity",
       "index": 12,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -178,6 +184,7 @@
       "prop": "grossProfit",
       "index": 13,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -185,6 +192,7 @@
       "prop": "grossProfitRate",
       "index": 14,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -192,6 +200,7 @@
       "prop": "amount",
       "index": 15,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {
@@ -199,6 +208,7 @@
       "prop": "purchaseAmount",
       "index": 16,
       "minWidth": 80,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -878,6 +878,8 @@ export default {
           {
             label: "条款说明",
             prop: "priceTermsDescription",
+            type: "textarea",
+            minRows: 2,
             span: 16
           },
           {
@@ -894,12 +896,14 @@ export default {
           {
             label: "收款说明",
             prop: "paymentTypeDescription",
+            type: "textarea",
+            minRows: 2,
             span: 16
           },
           {
             label: "订单日期",
             prop: "businesDate",
-            span: 8,
+            span: 6,
             // type: "date",
             // format: "yyyy-MM-dd",
             // valueFormat: "yyyy-MM-dd 00:00:00",
@@ -914,7 +918,7 @@ export default {
           {
             label: "预交日期",
             prop: "plannedDeliveryDate",
-            span: 8,
+            span: 6,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00"
@@ -922,20 +926,20 @@ export default {
           {
             label: "有效日期",
             prop: "dateValidity",
-            span: 8,
+            span: 6,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
             label: "销售订单号",
             prop: "orderNo",
-            span: 8
+            span: 6
           },
           {
             label: "币别",
             prop: "currency",
-            span: 8,
+            span: 6,
             rules: [
               {
                 required: true,
@@ -947,7 +951,7 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            span: 8,
+            span: 6,
             row: true,
             rules: [
               {
@@ -966,50 +970,51 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
-            span: 8
+            span: 6
           },
           {
             label: "箱量",
             prop: "boxNumber",
-            span: 8
+            span: 6
           },
           {
             label: "起订量",
             prop: "minOrder",
-            span: 8
+            span: 6
           },
           {
             label: "预计海运费",
             prop: "predictOceanFreight",
-            span: 8
+            span: 6
           },
           {
             label: "参考海运费",
             prop: "referenceOceanFreight",
-            span: 8
+            span: 6
           },
           {
             label: "实际海运费",
             prop: "oceanFreight",
-            span: 8
+            span: 6
           },
           {
             label: "产品毛利",
             prop: "grossProfit",
-            span: 8,
+            span: 6,
             disabled: true
           },
           {
             label: "产品利率",
             prop: "grossProfitRate",
-            span: 8,
+            span: 6,
             append: "%",
             disabled: true
           },
           {
             label: "单票毛利",
             prop: "singleTicketMargin",
-            span: 8,
+            span: 6,
+            row:true,
             disabled: true
           },
           {

src/views/exportTrade/shippingInquiry/config/customerContact.json

@@ -6,7 +6,7 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn":false,
-  "align": "center",
+  "headerAlign": "center",
   "menu":false,
   "refreshBtn": false,
   "showSummary": true,
@@ -73,6 +73,7 @@
       "prop": "orderQuantity",
       "index": 8,
       "width": 120,
+      "align": "right",
       "overHidden":true,
       "cell": true
     }

src/views/exportTrade/shippingInquiry/config/freight.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "addBtn": false,
   "delBtn":false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": 150,
   "refreshBtn": false,
   "showSummary": true,
@@ -38,6 +38,7 @@
       "label": "运费",
       "prop": "oceanFreight",
       "index": 4,
+      "align": "right",
       "overHidden": true
     },
     {

src/views/exportTrade/shippingInquiry/config/mainList.json

@@ -7,7 +7,7 @@
   "editBtn": false,
   "delBtn": false,
   "addBtn": false,
-  "align": "center",
+  "headerAlign": "center",
   "menuWidth": "70",
   "searchIcon": true,
   "searchIndex": 2,