调整按钮位置，修改表单字段

src/api/exportTrade/receipt.js

@@ -90,7 +90,7 @@ export function getSpecification(query) {
  */
  export function repeal(data) {
   return request({
-    url: '/api/blade-deliver-goods/exportDelivery/repeal',
+    url: '/api/blade-deliver-goods/exportDelivery/cancel',
     method: 'post',
     data: data
   })

src/components/fee-info/config/feeInfo.json

@@ -23,7 +23,8 @@
       "label": "费用名称",
       "prop": "feeName",
       "index": 2,
-      "width": 150
+      "width": 150,
+      "overHidden": true
     },
     {
       "label": "单价",

src/components/fee-info/main.vue

@@ -38,16 +38,16 @@
           >
         </template>
         <template slot="feeName" slot-scope="{ row, index }">
-          <div class="feeName">
-            <span>{{ row.feeName }}</span>
-            <el-button
-              size="small"
-              type="text"
-              @click="rePick(row, index)"
-              :disabled="disabled"
-              >选择</el-button
-            >
-          </div>
+          <el-button
+            size="small"
+            type="text"
+            @click="rePick(row, index)"
+            :disabled="disabled"
+            class="picker"
+            style="padding:4px 10px;float:left"
+            >选择</el-button
+          >
+          <span> {{ row.feeName }}</span>
         </template>
         <template slot="price" slot-scope="{ row }">
           <el-input
@@ -384,10 +384,7 @@ export default {
       if (columns.length > 0) {
         columns.forEach((item, index) => {
           sums[0] = "合计";
-          if (
-            item.property == "quantity" ||
-            item.property == "amount"
-          ) {
+          if (item.property == "quantity" || item.property == "amount") {
             let qtySum = 0;
             let amountSum = 0;
             data.forEach(e => {
@@ -396,7 +393,7 @@ export default {
             });
             //数量总计
             if (item.property == "quantity") {
-              sums[index] = qtySum ? qtySum.toFixed(2) : '0.00';
+              sums[index] = qtySum ? qtySum.toFixed(2) : "0.00";
             }
             //金额总计
             if (item.property == "amount") {
@@ -428,9 +425,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.feeName {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
 </style>

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -317,12 +317,23 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 8,
+            span: 16,
             slot: true
           },
           {
             label: "系统号",
             prop: "sysNo",
+            span: 8,
+            disabled: true
+          },
+          {
+            label: "联系人",
+            prop: "corpAttn",
+            span: 8
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
             span: 8
           },
           {
@@ -337,16 +348,6 @@ export default {
             }
           },
           {
-            label: "联系人",
-            prop: "corpAttn",
-            span: 8
-          },
-          {
-            label: "电话",
-            prop: "corpTel",
-            span: 8
-          },
-          {
             label: "起运港",
             prop: "portOfLoad",
             span: 8,
@@ -381,22 +382,7 @@ export default {
               value: "dictValue"
             }
           },
-          {
-            label: "订单日期",
-            prop: "businesDate",
-            span: 8,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
-          },
-          {
-            label: "有效日期",
-            prop: "dateValidity",
-            span: 8,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
-          },
+
           {
             label: "价格条款",
             prop: "priceTerms",
@@ -411,7 +397,7 @@ export default {
           {
             label: "条款说明",
             prop: "priceTermsDescription",
-            span: 8
+            span: 16
           },
           {
             label: "收款方式",
@@ -427,12 +413,28 @@ export default {
           {
             label: "收款说明",
             prop: "paymentTypeDescription",
-            span: 8
+            span: 16
+          },
+          {
+            label: "订单日期",
+            prop: "businesDate",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00"
+          },
+          {
+            label: "有效日期",
+            prop: "dateValidity",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
             label: "币别",
             prop: "currency",
-            span: 8,
+            span: 6,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
             props: {
@@ -443,15 +445,69 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            span: 8,
+            span: 6,
             slot: true
           },
           {
+            label: "箱型",
+            prop: "boxPile",
+            span: 8
+          },
+          {
+            label: "箱量",
+            prop: "boxNumber",
+            span: 8
+          },
+          {
+            label: "起订量",
+            prop: "minOrder",
+            span: 8
+          },
+          {
+            label: "预计海运费",
+            prop: "predictOceanFreight",
+            span: 8
+          },
+          {
+            label: "参考海运费",
+            prop: "referenceOceanFreight",
+            span: 8
+          },
+          {
+            label: "实际海运费",
+            prop: "oceanFreight",
+            span: 8
+          },
+          {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 2,
-            span: 16
+            span: 8
+          },
+          {
+            label: "采购备注",
+            prop: "purchaseRemark",
+            type: "textarea",
+            minRows: 2,
+            span: 8
+          },
+          {
+            label: "船务备注",
+            prop: "shippingRemark",
+            type: "textarea",
+            minRows: 2,
+            span: 8
+          },
+          {
+            label: "毛利额",
+            prop: "grossProfit",
+            span: 8
+          },
+          {
+            label: "毛利率",
+            prop: "grossProfitRate",
+            span: 8
           }
         ]
       },
@@ -793,8 +849,8 @@ export default {
           sums[0] = "合计";
           if (
             item.property == "orderQuantity" ||
-            item.property == "amount"||
-            item.property == "insurance"||
+            item.property == "amount" ||
+            item.property == "insurance" ||
             item.property == "freight"
           ) {
             let qtySum = 0;
@@ -809,7 +865,7 @@ export default {
             });
             //数量总计
             if (item.property == "orderQuantity") {
-              sums[index] = qtySum ? qtySum.toFixed(2) : '0.00';
+              sums[index] = qtySum ? qtySum.toFixed(2) : "0.00";
             }
             //金额总计
             if (item.property == "amount") {

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

@@ -14,13 +14,6 @@
   "addBtnText": "新增明细",
   "column": [
     {
-      "label": "销售订单号",
-      "prop": "orgOrderNo",
-      "index": 1,
-      "width": 100,
-      "overHidden": true
-    },
-    {
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 2,
@@ -73,7 +66,7 @@
     },
     {
       "label": "产品型号",
-      "prop": "itemType",
+      "prop": "specificationAndModel",
       "index": 8,
       "width": 100
     },

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

@@ -1,13 +1,13 @@
 {
-  "tip":false,
+  "tip": false,
   "searchShow": true,
   "searchMenuSpan": 6,
   "border": true,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
-  "addBtn":false,
-  "delBtn":false,
+  "addBtn": false,
+  "delBtn": false,
   "align": "center",
   "menuWidth": 150,
   "refreshBtn": false,
@@ -18,28 +18,28 @@
       "prop": "priceCategory",
       "index": 1,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=product_properties",
@@ -53,15 +53,15 @@
       "prop": "itemUrl",
       "index": 5,
       "width": 100,
-      "overHidden":true,
-      "hide":true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 6,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true
     },
     {
@@ -75,14 +75,21 @@
       "prop": "orderQuantity",
       "index": 8,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
+    },
+    {
+      "label": "已收数量",
+      "prop": "actualQuantity",
+      "index": 9,
+      "width": 120,
+      "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 9,
+      "index": 10,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
@@ -94,39 +101,39 @@
     {
       "label": "是否含税",
       "prop": "ifTax",
-      "index": 9,
+      "index": 11,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true
     },
     {
       "label": "汇率",
       "prop": "taxRate",
-      "index": 9,
+      "index": 12,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true
     },
     {
       "label": "单价",
       "prop": "price",
-      "index": 10,
+      "index": 13,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 11,
+      "index": 14,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 12,
+      "index": 15,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true
     }
   ]

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -298,7 +298,7 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 8,
+            span: 16,
             slot: true
           },
           {
@@ -308,6 +308,16 @@ export default {
             disabled: true
           },
           {
+            label: "联系人",
+            prop: "corpAttn",
+            span: 8
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            span: 8
+          },
+          {
             label: "订单状态",
             prop: "orderStatus",
             span: 8,
@@ -319,23 +329,6 @@ export default {
             }
           },
           {
-            label: "订单号",
-            prop: "orderNo",
-            span: 8
-          },
-          {
-            label: "联系人",
-            prop: "corpAttn",
-            span: 8,
-            rules: [{ validator: validateName, trigger: "blur" }]
-          },
-          {
-            label: "电话",
-            prop: "corpTel",
-            span: 8,
-            rules: [{ validator: validatePhone, trigger: "blur" }]
-          },
-          {
             label: "采购日期",
             prop: "businesDate",
             span: 8,
@@ -576,6 +569,10 @@ export default {
       }
     },
     quantityChange(row) {
+      if (Number(row.orderQuantity) < Number(row.actualQuantity)) {
+        row.orderQuantity = row.actualQuantity;
+        this.$message.error("修改的数量不能低于已收数量");
+      }
       if (!row.orderQuantity) {
         row.orderQuantity = 0;
       } else {

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -212,39 +212,11 @@ import {
   getSpecification
 } from "@/api/basicData/purchaseInquiry";
 import reportDialog from "@/components/report-dialog/main";
-import {
-  isvalidatemobile,
-  validatename,
-  micrometerFormat
-} from "@/util/validate";
+import { micrometerFormat } from "@/util/validate";
 import _ from "lodash";
 export default {
   name: "detailsPageEdit",
   data() {
-    const validatePhone = (rule, value, callback) => {
-      if (value != "") {
-        if (isvalidatemobile(value)[0]) {
-          this.$message.error("手机号码格式不正确");
-          callback(new Error(isvalidatemobile(value)[1]));
-        } else {
-          callback();
-        }
-      } else {
-        callback();
-      }
-    };
-    const validateName = (rule, value, callback) => {
-      if (value != "") {
-        if (validatename(value)) {
-          this.$message.error("联系人格式不正确");
-          callback(new Error(validatename(value)));
-        } else {
-          callback();
-        }
-      } else {
-        callback();
-      }
-    };
     return {
       configuration: {
         multipleChoices: false,
@@ -272,7 +244,7 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 8,
+            span: 16,
             slot: true
           },
           {
@@ -292,70 +264,7 @@ export default {
             }
           },
           {
-            label: "联系人",
-            prop: "corpAttn",
-            span: 8,
-            rules: [{ validator: validateName, trigger: "blur" }]
-          },
-          {
-            label: "电话",
-            prop: "corpTel",
-            span: 8,
-            rules: [{ validator: validatePhone, trigger: "blur" }]
-          },
-          {
-            label: "起运港",
-            prop: "portOfLoad",
-            span: 8,
-            type: "select",
-            filterable: true,
-            dicData: [],
-            props: {
-              label: "name",
-              value: "name"
-            }
-          },
-          {
-            label: "目的港",
-            prop: "portOfDestination",
-            span: 8,
-            type: "select",
-            filterable: true,
-            dicData: [],
-            props: {
-              label: "name",
-              value: "name"
-            }
-          },
-          {
-            label: "运输方式",
-            prop: "transport",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          },
-          {
-            label: "价格条款",
-            prop: "priceTerms",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          },
-          {
-            label: "条款说明",
-            prop: "priceTermsDescription",
-            span: 8
-          },
-          {
-            label: "订单日期",
+            label: "询价日期",
             prop: "businesDate",
             span: 8,
             type: "date",
@@ -371,22 +280,6 @@ export default {
             valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
-            label: "收款方式",
-            prop: "paymentType",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          },
-          {
-            label: "收款说明",
-            prop: "paymentTypeDescription",
-            span: 8
-          },
-          {
             label: "币别",
             prop: "currency",
             span: 8,
@@ -401,14 +294,29 @@ export default {
             label: "汇率",
             prop: "exchangeRate",
             span: 8,
-            slot: true
+            slot: true,
+            row: true
           },
           {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 2,
-            span: 16
+            span: 8
+          },
+          {
+            label: "采购备注",
+            prop: "orderRemark",
+            type: "textarea",
+            minRows: 2,
+            span: 8
+          },
+          {
+            label: "船务备注",
+            prop: "orderRemark",
+            type: "textarea",
+            minRows: 2,
+            span: 8
           }
         ]
       },

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

@@ -71,7 +71,7 @@
       "width": 100
     },
     {
-      "label": "数量",
+      "label": "收货数量",
       "prop": "actualQuantity",
       "index": 9,
       "width": 100,

src/views/exportTrade/receipt/detailsPage.vue

@@ -21,7 +21,7 @@
       <el-button
         type="info"
         @click.stop="editCustomer('repeal')"
-        v-if="form.deliveryStatus != '录入'"
+        v-if="form.deliveryStatus == '已收货'"
         class="receipt-customer-btn"
         >撤销收货</el-button
       >
@@ -305,7 +305,7 @@ export default {
           },
           {
             label: "采购订单号",
-            prop: "orderNo",
+            prop: "srcOrderNo",
             span: 8
           },
           {
@@ -634,7 +634,6 @@ export default {
             });
           }
           if (status == "save") {
-            console.log("111111");
             this.$confirm("此操作将确认收货, 是否继续?", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",

src/views/exportTrade/salesContract/detailsPage.vue

@@ -55,6 +55,77 @@
               ><template slot="append">%</template></el-input
             >
           </template>
+          <template slot="boxNumber">
+            <el-input
+              size="mini"
+              v-model="form.boxNumber"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入 起订量"
+              :disabled="detailData.status == 1"
+            />
+          </template>
+          <template slot="minOrder">
+            <el-input
+              size="mini"
+              v-model="form.minOrder"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入 起订量"
+              :disabled="detailData.status == 1"
+            />
+          </template>
+          <template slot="predictOceanFreight">
+            <el-input
+              size="mini"
+              v-model="form.predictOceanFreight"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入 预计海运费"
+              :disabled="detailData.status == 1"
+            />
+          </template>
+          <template slot="referenceOceanFreight">
+            <el-input
+              size="mini"
+              v-model="form.referenceOceanFreight"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入 参考海运费"
+              :disabled="detailData.status == 1"
+            />
+          </template>
+          <template slot="oceanFreight">
+            <el-input
+              size="mini"
+              v-model="form.oceanFreight"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入 实际海运费"
+              :disabled="detailData.status == 1"
+            />
+          </template>
+          <template slot="grossProfit">
+            <el-input
+              size="mini"
+              v-model="form.grossProfit"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入 毛利额"
+              :disabled="detailData.status == 1"
+            />
+          </template>
+          <template slot="grossProfitRate">
+            <el-input
+              size="mini"
+              v-model="form.grossProfitRate"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+              @change="grossProfitRateChange"
+              placeholder="请输入 毛利率"
+              :disabled="detailData.status == 1"
+              ><template slot="append">%</template></el-input
+            >
+          </template>
         </avue-form>
       </basic-container>
       <div>
@@ -296,7 +367,7 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 8,
+            span: 16,
             slot: true
           },
           {
@@ -306,6 +377,16 @@ export default {
             disabled: true
           },
           {
+            label: "联系人",
+            prop: "corpAttn",
+            span: 8
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            span: 8
+          },
+          {
             label: "订单状态",
             prop: "orderStatus",
             span: 8,
@@ -317,26 +398,6 @@ export default {
             }
           },
           {
-            label: "业务员",
-            prop: "salesName",
-            span: 8
-          },
-          {
-            label: "提成标准",
-            prop: "commissionRate",
-            span: 8
-          },
-          {
-            label: "联系人",
-            prop: "corpAttn",
-            span: 8
-          },
-          {
-            label: "电话",
-            prop: "corpTel",
-            span: 8
-          },
-          {
             label: "起运港",
             prop: "portOfLoad",
             span: 8,
@@ -371,6 +432,7 @@ export default {
               value: "dictValue"
             }
           },
+
           {
             label: "价格条款",
             prop: "priceTerms",
@@ -385,23 +447,7 @@ export default {
           {
             label: "条款说明",
             prop: "priceTermsDescription",
-            span: 8
-          },
-          {
-            label: "订单日期",
-            prop: "businesDate",
-            span: 8,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
-          },
-          {
-            label: "计划交期",
-            prop: "dateValidity",
-            span: 8,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
+            span: 16
           },
           {
             label: "收款方式",
@@ -417,12 +463,28 @@ export default {
           {
             label: "收款说明",
             prop: "paymentTypeDescription",
-            span: 8
+            span: 16
+          },
+          {
+            label: "订单日期",
+            prop: "businesDate",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00"
+          },
+          {
+            label: "预交日期",
+            prop: "dateValidity",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
             label: "币别",
             prop: "currency",
-            span: 8,
+            span: 6,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
             props: {
@@ -433,15 +495,69 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            span: 8,
+            span: 6,
             slot: true
           },
           {
+            label: "箱型",
+            prop: "boxPile",
+            span: 8
+          },
+          {
+            label: "箱量",
+            prop: "boxNumber",
+            span: 8
+          },
+          {
+            label: "起订量",
+            prop: "minOrder",
+            span: 8
+          },
+          {
+            label: "预计海运费",
+            prop: "predictOceanFreight",
+            span: 8
+          },
+          {
+            label: "参考海运费",
+            prop: "referenceOceanFreight",
+            span: 8
+          },
+          {
+            label: "实际海运费",
+            prop: "oceanFreight",
+            span: 8
+          },
+          {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 2,
-            span: 24
+            span: 8
+          },
+          {
+            label: "采购备注",
+            prop: "purchaseRemark",
+            type: "textarea",
+            minRows: 2,
+            span: 8
+          },
+          {
+            label: "船务备注",
+            prop: "shippingRemark",
+            type: "textarea",
+            minRows: 2,
+            span: 8
+          },
+          {
+            label: "毛利额",
+            prop: "grossProfit",
+            span: 8
+          },
+          {
+            label: "毛利率",
+            prop: "grossProfitRate",
+            span: 8
           }
         ]
       },
@@ -546,7 +662,6 @@ export default {
       this.getColumnName(5),
       tableOption
     );
-    console.log(this.tableOption);
     this.goodsOption = await this.getColumnData(
       this.getColumnName(28),
       goodsOption
@@ -584,11 +699,11 @@ export default {
       this.findObject(this.option.column, "portOfDestination").dicData =
         res.data;
     });
-    if (this.detailData.pageType == "new") {
-      getSysNo().then(res => {
-        this.form.sysNo = res.data.data;
-      });
-    }
+    // if (this.detailData.pageType == "new") {
+    //   getSysNo().then(res => {
+    //     this.form.sysNo = res.data.data;
+    //   });
+    // }
   },
   methods: {
     rowCell(row, index) {
@@ -614,7 +729,6 @@ export default {
       }
     },
     quantityChange(row) {
-      console.log(row.orderQuantity, row.actualQuantity);
       if (Number(row.orderQuantity) < Number(row.actualQuantity)) {
         row.orderQuantity = row.actualQuantity;
         this.$message.error("修改的数量不能低于发货数量");
@@ -626,12 +740,17 @@ export default {
       }
     },
     rateChange(row) {
-      console.log(row);
       if (row >= 100) {
         this.form.exchangeRate = 0;
         this.$message.error("汇率不能超过100%");
       }
     },
+    grossProfitRateChange(row) {
+      if (row >= 100) {
+        this.form.grossProfitRate = 0;
+        this.$message.error("毛利率不能超过100%");
+      }
+    },
     rowSave(row) {
       console.log(row);
       this.$set(row, "$cellEdit", false);
@@ -801,6 +920,7 @@ export default {
               e.actualQuantity = e.orderQuantity;
               e.contractAmount = e.amount;
               e.srcId = e.id;
+              e.specificationAndModel = e.itemType;
               delete e.id;
               delete e.version;
               delete e.status;

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

@@ -0,0 +1,47 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "addBtn":false,
+  "align": "center",
+  "menuWidth": 300,
+  "menu":false,
+  "refreshBtn": false,
+  "showSummary": true,
+  "column": [{
+      "label": "船公司",
+      "prop": "",
+      "index": 1,
+      "overHidden":true
+    },
+    {
+      "label": "船期",
+      "prop": "",
+      "index": 2,
+      "overHidden":true
+    },
+    {
+      "label": "运费",
+      "prop": "",
+      "index": 3,
+      "overHidden":true
+    },
+    {
+      "label": "重点推荐",
+      "prop": "",
+      "index": 14,
+      "overHidden":true,
+      "cell": true
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "index": 14,
+      "overHidden":true,
+      "cell": true
+    }
+  ]
+}

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -123,7 +123,7 @@
 <script>
 import tableOption from "./config/customerContact.json";
 import goodsOption from "./config/commodity.json";
-import freightOption from "./config/commodity.json";
+import freightOption from "./config/freight.json";
 import feeInfo from "@/components/fee-info/main";
 import {
   detail,