QuKatie 3 rokov pred
rodič
commit
df041f1820

+ 32 - 32
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -711,13 +711,12 @@ export default {
           {
             label: "公司主体",
             prop: "belongToCorpId",
-            span: 16,
-            row: true
+            span: 6
           },
           {
             label: "起运港",
             prop: "portOfLoad",
-            span: 8,
+            span: 6,
             type: "select",
             filterable: true,
             rules: [
@@ -736,7 +735,7 @@ export default {
           {
             label: "目的港",
             prop: "portOfDestination",
-            span: 8,
+            span: 6,
             type: "select",
             filterable: true,
             rules: [
@@ -755,7 +754,7 @@ export default {
           {
             label: "运输方式",
             prop: "transport",
-            span: 8,
+            span: 6,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
             props: {
@@ -766,7 +765,7 @@ export default {
           {
             label: "价格条款",
             prop: "priceTerms",
-            span: 8
+            span: 6
             // type: "select",
             // dicData:[],
             // props: {
@@ -778,13 +777,14 @@ export default {
             label: "条款说明",
             prop: "priceTermsDescription",
             type: "textarea",
-            minRows: 2,
-            span: 16
+            minRows: 1,
+            span: 12,
+            row: true
           },
           {
             label: "收款方式",
             prop: "paymentType",
-            span: 8
+            span: 6
             // type: "select",
             // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
             // props: {
@@ -796,8 +796,9 @@ export default {
             label: "收款说明",
             prop: "paymentTypeDescription",
             type: "textarea",
-            minRows: 2,
-            span: 16
+            minRows: 1,
+            span: 12,
+            row: true
           },
           {
             label: "报价日期",
@@ -855,9 +856,28 @@ export default {
             ]
           },
           {
+            label: "产品毛利",
+            prop: "grossProfit",
+            span: 6,
+            disabled: true
+          },
+          {
+            label: "产品利率",
+            prop: "grossProfitRate",
+            span: 6,
+            append: "%",
+            disabled: true
+          },
+          {
+            label: "单票毛利",
+            prop: "singleTicketMargin",
+            span: 6,
+            row: true,
+            disabled: true
+          },
+          {
             label: "报价单号",
             prop: "orderNo",
-            row: true,
             span: 6
           },
           {
@@ -891,26 +911,6 @@ export default {
             span: 6
           },
           {
-            label: "产品毛利",
-            prop: "grossProfit",
-            span: 6,
-            disabled: true
-          },
-          {
-            label: "产品利率",
-            prop: "grossProfitRate",
-            span: 6,
-            append: "%",
-            disabled: true
-          },
-          {
-            label: "单票毛利",
-            prop: "singleTicketMargin",
-            span: 6,
-            row: true,
-            disabled: true
-          },
-          {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",

+ 33 - 31
src/views/exportTrade/salesContract/detailsPage.vue

@@ -811,13 +811,12 @@ export default {
           {
             label: "公司主体",
             prop: "belongToCorpId",
-            span: 16,
-            row: true
+            span: 6
           },
           {
             label: "起运港",
             prop: "portOfLoad",
-            span: 8,
+            span: 6,
             type: "select",
             filterable: true,
             rules: [
@@ -836,7 +835,7 @@ export default {
           {
             label: "目的港",
             prop: "portOfDestination",
-            span: 8,
+            span: 6,
             type: "select",
             filterable: true,
             rules: [
@@ -855,7 +854,7 @@ export default {
           {
             label: "运输方式",
             prop: "transport",
-            span: 8,
+            span: 6,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
             props: {
@@ -867,7 +866,7 @@ export default {
           {
             label: "价格条款",
             prop: "priceTerms",
-            span: 8
+            span: 6
             // type: "select",
             // dicUrl: "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
             // props: {
@@ -879,13 +878,14 @@ export default {
             label: "条款说明",
             prop: "priceTermsDescription",
             type: "textarea",
-            minRows: 2,
-            span: 16
+            minRows: 1,
+            span: 12,
+            row: true
           },
           {
             label: "收款方式",
             prop: "paymentType",
-            span: 8
+            span: 6
             // type: "select",
             // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
             // props: {
@@ -897,8 +897,9 @@ export default {
             label: "收款说明",
             prop: "paymentTypeDescription",
             type: "textarea",
-            minRows: 2,
-            span: 16
+            minRows: 1,
+            span: 12,
+            row: true
           },
           {
             label: "订单日期",
@@ -962,6 +963,26 @@ export default {
             ]
           },
           {
+            label: "产品毛利",
+            prop: "grossProfit",
+            span: 6,
+            disabled: true
+          },
+          {
+            label: "产品利率",
+            prop: "grossProfitRate",
+            span: 6,
+            append: "%",
+            disabled: true
+          },
+          {
+            label: "单票毛利",
+            prop: "singleTicketMargin",
+            span: 6,
+            row: true,
+            disabled: true
+          },
+          {
             label: "箱型",
             prop: "boxPile",
             type: "select",
@@ -995,27 +1016,8 @@ export default {
           {
             label: "实际海运费",
             prop: "oceanFreight",
-            span: 6
-          },
-          {
-            label: "产品毛利",
-            prop: "grossProfit",
-            span: 6,
-            disabled: true
-          },
-          {
-            label: "产品利率",
-            prop: "grossProfitRate",
-            span: 6,
-            append: "%",
-            disabled: true
-          },
-          {
-            label: "单票毛利",
-            prop: "singleTicketMargin",
             span: 6,
-            row:true,
-            disabled: true
+            row: true
           },
           {
             label: "备注",