修改bug

src/api/basicData/purchaseInquiry.js

@@ -20,7 +20,14 @@ export function detail(id) {
 //修改和新增
 export function submit(data) {
   return request({
-    url: '/api/trade-purchase/exportEnquiry/submit',
+    url: '/api/trade-purchase/purchase-enquiry/submit',
+    method: 'post',
+    data: data
+  })
+}
+export function submitMessage(data) {
+  return request({
+    url: '/api/trade-purchase/purchase-enquiry/submitMessage',
     method: 'post',
     data: data
   })

src/api/basicData/shippingInquiry.js

@@ -26,15 +26,15 @@ export function submit(data) {
   })
 }
 //明细表删除
-export function delItem(data) {
-  return request({
-    url: '/api/trade-purchase/shipping-enquiry/remove-byItem',
-    method: 'post',
-    data: {
-      id: data
-    }
-  })
-}
+// export function delItem(data) {
+//   return request({
+//     url: '/api/trade-purchase/shipping-enquiry/remove-byItem',
+//     method: 'post',
+//     data: {
+//       id: data
+//     }
+//   })
+// }
 //主表删除
 export function remove(data) {
   return request({
@@ -81,4 +81,14 @@ export function getSpecification(query) {
     method: 'get',
     params: query
   })
+}
+//明细表删除
+export function delItem(data) {
+  return request({
+    url: '/api/trade-purchase/shipping-enquiry/removeFreight',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
 }

src/components/customer-dialog/configuration/mainList.json

@@ -0,0 +1,50 @@
+{
+    "lazy": true,
+    "align": "center",
+    "border": true,
+    "index": true,
+    "tree": true,
+    "addBtn": false,
+    "menu":false,
+    "selection":true,
+    "tip":false,
+    "header":false,
+    "column":[
+        {
+            "label": "客户编码",
+            "prop": "code",
+            "index": 1,
+            "width":100
+        },{
+            "label": "客户全称",
+            "prop": "cname",
+            "index": 2,
+            "width":180
+        },{
+            "label": "区域",
+            "prop": "belongtoarea",
+            "index": 4,
+            "width":180
+        },{
+            "label": "所属公司",
+            "prop": "belongtocompany",
+            "index": 5,
+            "width":100
+        },{
+            "label": "联系人",
+            "prop": "attn",
+            "index": 6,
+            "width":100
+        },{
+            "label": "代理品牌",
+            "prop": "goodtypes",
+            "index": 7,
+            "width":100
+        },{
+            "label": "客户等级 ",
+            "prop": "creditLevel",
+            "index": 8,
+            "width":100
+        }
+    ]
+}

src/components/customer-dialog/main.vue

@@ -0,0 +1,198 @@
+<template>
+  <div>
+    <div @click="portinfoVisible = true && !disabled">
+      <el-input
+        v-model="value"
+        size="small"
+        @input="$emit('balabala', value)"
+        placeholder="请选择"
+        :disabled="disabled"
+      />
+    </div>
+    <el-dialog
+      title="客户信息"
+      :visible.sync="portinfoVisible"
+      width="60%"
+      append-to-body
+      @closed="closed"
+      v-dialog-drag
+    >
+      <span>
+        <el-row>
+          <el-col :span="5">
+            <el-scrollbar>
+              <basic-container>
+                <avue-tree
+                  :option="treeOption"
+                  :data="treeData"
+                  @node-click="nodeClick"
+                />
+              </basic-container>
+            </el-scrollbar>
+          </el-col>
+          <el-col :span="19">
+            <avue-crud
+              :option="tableOption"
+              :data="dataList"
+              ref="crud"
+              v-model="form"
+              :page.sync="page"
+              @search-change="searchChange"
+              @refresh-change="refreshChange"
+              @selection-change="selectionChange"
+              @on-load="onLoad"
+              @tree-load="treeLoad"
+            >
+            </avue-crud>
+          </el-col>
+        </el-row>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="portinfoVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="importCorp"
+          :disabled="selectionList.length != 1"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import option from "./configuration/mainList.json";
+import {
+  customerList,
+  typeSave,
+  deleteDetails,
+  getDeptLazyTree
+} from "@/api/basicData/customerInformation";
+
+export default {
+  data() {
+    return {
+      loading: true,
+      dataList: [],
+      tableOption: option,
+      form: {},
+      search: {},
+      treeDeptId: "",
+      treeDeptName: "",
+      height: window.innerHeight - 500,
+      page: {
+        currentPage: 1,
+        total: 0,
+        pageSize: 10
+      },
+      treeOption: {
+        nodeKey: "id",
+        lazy: true,
+        treeLoad: function(node, resolve) {
+          const parentId = node.level === 0 ? 0 : node.data.id;
+          getDeptLazyTree(parentId).then(res => {
+            resolve(
+              res.data.data.map(item => {
+                return {
+                  ...item,
+                  leaf: !item.hasChildren
+                };
+              })
+            );
+          });
+        },
+        addBtn: false,
+        menu: false,
+        size: "small",
+        props: {
+          labelText: "标题",
+          label: "title",
+          value: "value",
+          children: "children"
+        }
+      },
+      portinfoVisible: false,
+      selectionList: []
+    };
+  },
+  props: {
+    value: String,
+    disabled: Boolean,
+    cropIndex: Number
+  },
+  model: {
+    prop: "value",
+    event: "balabala"
+  },
+  created() {},
+  mounted() {
+    option.height = window.innerHeight - 500;
+  },
+  methods: {
+    closed() {
+      this.$refs.crud.toggleSelection();
+    },
+    importCorp() {
+      this.$emit("balabala", this.selectionList[0].cname);
+      this.$emit("getcorpId", {
+        id: this.selectionList[0].id,
+        index: this.cropIndex
+      });
+      this.portinfoVisible = false;
+    },
+    onLoad(page, params = { parentId: 0 }) {
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        corpsTypeId: this.treeDeptId
+      });
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records;
+        this.page.total = res.data.data.total;
+        if (this.page.total) {
+          this.tableOption.height = window.innerHeight - 500;
+        } else {
+          this.tableOption.height = window.innerHeight - 200;
+        }
+      });
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    sizeChange(val) {
+      this.page.pageSize = val;
+      this.getList();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+      this.getList();
+    },
+    //刷新触发
+    refreshChange() {
+      this.page = {
+        pageSize: 10,
+        pagerCount: 1,
+        total: 0
+      };
+    },
+    saveColumn(row, column) {
+      console.log(row, column);
+    },
+    //列表内展开树节点
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      customerList({ parentId: parentId }).then(res => {
+        resolve(res.data.data.records);
+      });
+    },
+    nodeClick(data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      console.log(this.treeDeptId);
+      this.onLoad(this.page);
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss"></style>

src/util/contrastData.js

@@ -2,6 +2,7 @@
 export function contrastObj(newval, oldval) {
   let reg = /^[A-Za-z]+$/;
   for (let newitem in newval) {
+    console.log(newval, oldval)
     if (Object.keys(oldval).length == 0) {
       if (newval[newitem]) {
         return true
@@ -15,6 +16,7 @@ export function contrastObj(newval, oldval) {
         delete oldval.olditem
       }
       if (newitem == olditem) {
+        console.log(newitem, olditem)
         if (newval[newitem] != oldval[olditem]) {
           return true
         }

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

@@ -6,7 +6,7 @@
   "viewBtn": false,
   "editBtn": false,
   "addBtn": false,
-  "delBtn":false,
+  "delBtn": false,
   "align": "center",
   "menuWidth": 150,
   "refreshBtn": false,
@@ -47,17 +47,9 @@
       }
     },
     {
-      "label": "产品照片",
-      "prop": "itemUrl",
-      "index": 5,
-      "width": 100,
-      "overHidden": true,
-      "hide": true
-    },
-    {
       "label": "产品描述",
       "prop": "itemDescription",
-      "index": 6,
+      "index": 5,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -65,61 +57,61 @@
     {
       "label": "产品型号",
       "prop": "itemType",
-      "index": 7,
+      "index": 6,
       "width": 100
     },
     {
-      "label": "单价",
-      "prop": "price",
+      "label": "采购单价",
+      "prop": "purchaseAmount",
+      "index": 7,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpId",
       "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "计价单位",
-      "prop": "unit",
+      "label": "重点推荐",
+      "prop": "priorityReferrer",
       "index": 9,
       "width": 100,
-      "overHidden": true,
-      "cell": true,
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
-      "props": {
-        "label": "dictValue",
-        "value": "dictValue"
-      }
+      "overHidden": true
     },
     {
-      "label": "数量",
-      "prop": "orderQuantity",
+      "label": "推荐理由",
+      "prop": "referrerReason",
       "index": 10,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "价格条款",
-      "prop": "tradeTerms",
+      "label": "销售价",
+      "prop": "price",
       "index": 11,
       "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 12,
+      "width": 100,
       "overHidden": true,
       "cell": true,
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
       "props": {
         "label": "dictValue",
-        "value": "dictKey"
+        "value": "dictValue"
       }
     },
     {
-      "label": "金额",
-      "prop": "amount",
-      "index": 12,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "税率",
-      "prop": "taxRate",
+      "label": "数量",
+      "prop": "orderQuantity",
       "index": 13,
       "width": 100,
       "overHidden": true
@@ -146,9 +138,23 @@
       "overHidden": true
     },
     {
+      "label": "金额",
+      "prop": "amount",
+      "index": 17,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "税率",
+      "prop": "taxRate",
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "备注",
       "prop": "remarks",
-      "index": 17,
+      "index": 19,
       "width": 100,
       "overHidden": true,
       "cell": true

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

@@ -9,6 +9,8 @@
   "addBtn": false,
   "align": "center",
   "menuWidth": "180",
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",
@@ -64,7 +66,7 @@
       "width": 100,
       "overHidden": true,
       "type": "select",
-      "filterable":true,
+      "filterable": true,
       "dicData": [],
       "props": {
         "label": "name",

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -56,6 +56,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>
       <containerTitle title="商品信息"></containerTitle>
@@ -117,6 +188,48 @@
               >删 除</el-button
             >
           </template>
+          <template slot="itemType" slot-scope="{ row }">
+            <el-select
+              v-if="row.$cellEdit"
+              v-model="row.itemType"
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请输入"
+              size="small"
+              @focus="itemTypeFocus(row)"
+            >
+              <el-option
+                v-for="(item, index) in itemtypeList"
+                :key="index"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <span v-else>{{ row.itemType }}</span>
+          </template>
+          <template slot="priorityReferrer" slot-scope="{ row }">
+            <el-checkbox :disabled="!row.$cellEdit" v-model="row.priorityReferrer" :true-label="1" :false-label="0" />
+          </template>
+          <template slot="corpId" slot-scope="{ row, index }">
+            <customer-dialog
+              v-if="row.$cellEdit"
+              v-model="row.corpName"
+              :cropIndex="index"
+              @getcorpId="getcorpId"
+            ></customer-dialog>
+            <span v-else>{{ row.corpName }}</span>
+          </template>
+          <template slot="purchaseAmount" slot-scope="{ row }">
+            <el-input
+              v-if="row.$cellEdit"
+              v-model="row.purchaseAmount"
+              size="small"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+            ></el-input>
+            <span v-else>{{ row.purchaseAmount | micrometerFormat }}</span>
+          </template>
           <template slot="price" slot-scope="{ row }">
             <el-input
               v-if="row.$cellEdit"
@@ -136,7 +249,7 @@
               v-model="row.orderQuantity"
               size="small"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
-              @change="quantityChange(row)"
+              @change="priceChange(row)"
             ></el-input>
             <span v-else>{{ row.orderQuantity }}</span>
           </template>
@@ -156,6 +269,7 @@
               v-model="row.insurance"
               size="small"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+              @change="priceChange(row)"
             ></el-input>
             <span v-else>{{ row.insurance | micrometerFormat }}</span>
           </template>
@@ -165,6 +279,7 @@
               v-model="row.freight"
               size="small"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+              @change="priceChange(row)"
             ></el-input>
             <span v-else>{{ row.freight | micrometerFormat }}</span>
           </template>
@@ -178,26 +293,6 @@
             ></el-input>
             <span v-else>{{ row.taxRate | isPercentage }}</span>
           </template>
-          <template slot="itemType" slot-scope="{ row }">
-            <el-select
-              v-if="row.$cellEdit"
-              v-model="row.itemType"
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请输入"
-              @focus="itemTypeFocus(row)"
-            >
-              <el-option
-                v-for="(item, index) in itemtypeList"
-                :key="index"
-                :label="item.value"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <span v-else>{{ row.itemType }}</span>
-          </template>
         </avue-crud>
       </basic-container>
       <fee-info
@@ -271,6 +366,7 @@
 import tableOption from "./config/customerContact.json";
 import goodsOption from "./config/commodity.json";
 import feeInfo from "@/components/fee-info/main";
+import customerDialog from "@/components/customer-dialog/main";
 import {
   detail,
   submit,
@@ -418,7 +514,7 @@ export default {
           {
             label: "订单日期",
             prop: "businesDate",
-            span: 6,
+            span: 8,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00"
@@ -426,15 +522,16 @@ export default {
           {
             label: "有效日期",
             prop: "dateValidity",
-            span: 6,
+            span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
+            valueFormat: "yyyy-MM-dd 00:00:00",
+            row: true
           },
           {
             label: "币别",
             prop: "currency",
-            span: 6,
+            span: 8,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
             props: {
@@ -445,8 +542,9 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            span: 6,
-            slot: true
+            span: 8,
+            slot: true,
+            row: true
           },
           {
             label: "箱型",
@@ -479,6 +577,17 @@ export default {
             span: 8
           },
           {
+            label: "毛利额",
+            prop: "grossProfit",
+            span: 8
+          },
+          {
+            label: "毛利率",
+            prop: "grossProfitRate",
+            span: 8,
+            row: true
+          },
+          {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
@@ -498,16 +607,6 @@ export default {
             type: "textarea",
             minRows: 2,
             span: 8
-          },
-          {
-            label: "毛利额",
-            prop: "grossProfit",
-            span: 8
-          },
-          {
-            label: "毛利率",
-            prop: "grossProfitRate",
-            span: 8
           }
         ]
       },
@@ -560,7 +659,8 @@ export default {
   },
   components: {
     reportDialog,
-    feeInfo
+    feeInfo,
+    customerDialog
   },
   async created() {
     this.tableOption = await this.getColumnData(
@@ -595,6 +695,9 @@ export default {
     }
   },
   methods: {
+    getcorpId(row) {
+      this.data[row.index].corpId = row.id;
+    },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
         this.$set(row, "$cellEdit", false);
@@ -610,17 +713,31 @@ export default {
       });
     },
     priceChange(row) {
-      if (!row.price) {
-        row.price = 0;
-      } else {
-        row.amount = _.multiply(row.price, row.orderQuantity).toFixed(2);
-      }
+      const sum = _.multiply(
+        _.add(
+          Number(
+            _.multiply(
+              row.price ? row.price : 0,
+              row.orderQuantity ? row.orderQuantity : 0
+            )
+          ),
+          Number(
+            _.add(
+              Number(row.insurance ? row.insurance : 0),
+              Number(row.freight ? row.freight : 0)
+            )
+          )
+        ),
+        _.divide(row.discount ? row.discount : 10, 10)
+      );
+      row.amount = Number(sum ? sum : 0).toFixed(2);
     },
     discountChange(row) {
       if (row.discount >= 10) {
-        row.discount = 0;
+        row.discount = null;
         this.$message.error("请正确输入折扣");
       }
+      this.priceChange(row);
     },
     taxRateChange(row) {
       if (row.taxRate > 100) {
@@ -628,11 +745,10 @@ export default {
         this.$message.error("请正确输入税率");
       }
     },
-    quantityChange(row) {
-      if (!row.orderQuantity) {
-        row.orderQuantity = 0;
-      } else {
-        row.amount = _.multiply(row.price, row.orderQuantity).toFixed(2);
+    grossProfitRateChange(row) {
+      if (row >= 100) {
+        this.form.grossProfitRate = 0;
+        this.$message.error("毛利率不能超过100%");
       }
     },
     saveShipping() {
@@ -711,9 +827,12 @@ export default {
           itemProp: null,
           itemDescription: null,
           itemType: null,
-          orderQuantity: 0,
           tradeTerms: null,
           price: 0,
+          orderQuantity: 0,
+          insurance: 0,
+          freight: 0,
+          discount: null,
           amount: 0,
           taxRate: 0,
           unit: e.unit,
@@ -782,7 +901,7 @@ export default {
               return this.$message.error(`请输入第${i + 1}行的结算中心`);
             }
             if (orderFeesList[i].price == 0) {
-              return this.$message.error(`请正确输入第${i + 1}行的价格`);
+              return this.$message.error(`请正确输入第${i + 1}行的销售价`);
             }
             if (orderFeesList[i].orderQuantity == 0) {
               return this.$message.error(`请正确输入第${i + 1}行的数量`);

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

@@ -11,6 +11,8 @@
   "menuWidth": "180",
   "searchLabelWidth": "90",
   "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",

src/views/exportTrade/invoice/detailsPage.vue

@@ -236,6 +236,7 @@ import {
 import uploadFile from "@/components/upload-file/main";
 import reportDialog from "@/components/report-dialog/main";
 import { micrometerFormat } from "@/util/validate";
+import { contrastObj, contrastList } from "@/util/contrastData";
 import _ from "lodash";
 export default {
   name: "detailsPageEdit",
@@ -400,7 +401,13 @@ export default {
       treeDeptId: null,
       orderFeesList: [],
       orderFilesList: [],
-      itemtypeList: []
+      itemtypeList: [],
+      oldform: {
+        deliveryStatus: "录入"
+      },
+      olddata: [],
+      oldorderFeesList: [],
+      oldorderFilesList: []
     };
   },
   props: {
@@ -583,6 +590,12 @@ export default {
         this.orderFeesList = res.data.data.deliveryFeesList;
         this.orderFilesList = res.data.data.deliveryFilesList;
         this.configuration.dicData = this.form.corpName;
+        this.oldform = res.data.data;
+        this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+        this.oldorderFeesList = this.deepClone(res.data.data.deliveryFeesList);
+        this.oldorderFilesList = this.deepClone(
+          res.data.data.deliveryFilesList
+        );
       });
     },
     getGenerate(data) {
@@ -592,7 +605,7 @@ export default {
       this.configuration.dicData = data.corpName;
     },
     //修改提交触发
-    editCustomer(status) {
+    editCustomer(status, status2) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -621,6 +634,17 @@ export default {
               this.data = res.data.data.deliveryItemsList;
               this.orderFeesList = res.data.data.deliveryFeesList;
               this.orderFilesList = res.data.data.deliveryFilesList;
+              this.oldform = res.data.data;
+              this.olddata = this.deepClone(res.data.data.deliveryItemsList);
+              this.oldorderFeesList = this.deepClone(
+                res.data.data.deliveryFeesList
+              );
+              this.oldorderFilesList = this.deepClone(
+                res.data.data.deliveryFilesList
+              );
+              if (status2 == "goBack") {
+                this.$emit("goBack");
+              }
             });
           }
           if (status == "save") {
@@ -670,7 +694,37 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$emit("goBack");
+      let orderFeesList = this.$refs.feeInfo.submitData();
+      let orderFilesList = this.$refs.uploadFile.submitData();
+      let form = this.deepClone(this.form);
+      if (
+        form.deliveryStatus == "录入" &&
+        this.oldform.deliveryStatus == "录入"
+      ) {
+        delete form.deliveryStatus;
+        delete form.$deliveryStatus;
+        delete this.oldform.deliveryStatus;
+      }
+      if (
+        contrastObj(form, this.oldform) ||
+        contrastList(this.data, this.olddata) ||
+        contrastList(orderFeesList, this.oldorderFeesList) ||
+        contrastList(orderFilesList, this.oldorderFilesList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.editCustomer("submit", "goBack");
+          })
+          .catch(() => {
+            this.$emit("goBack");
+          });
+      } else {
+        this.$emit("goBack");
+      }
     },
     openReport() {
       this.switchDialog = !this.switchDialog;

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

@@ -10,6 +10,8 @@
   "align": "center",
   "menuWidth": "180",
   "searchLabelWidth": "90",
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -239,6 +239,7 @@ import {
 } from "@/api/exportTrade/purchaseContract";
 import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
+import { contrastObj, contrastList } from "@/util/contrastData";
 import {
   isvalidatemobile,
   validatename,
@@ -345,7 +346,7 @@ export default {
             valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
-            label: "实际交货日",
+            label: "实际交货日期",
             prop: "requiredDeliveryDate",
             span: 8,
             type: "date",
@@ -364,7 +365,7 @@ export default {
             }
           },
           {
-            label: "收款方式",
+            label: "付款方式",
             prop: "paymentType",
             span: 8,
             type: "select",
@@ -375,7 +376,7 @@ export default {
             }
           },
           {
-            label: "收款说明",
+            label: "付款说明",
             prop: "paymentTypeDescription",
             span: 8
           },
@@ -394,14 +395,15 @@ export default {
             label: "汇率",
             prop: "exchangeRate",
             span: 8,
-            slot: true
+            slot: true,
+            row: true
           },
           {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 2,
-            span: 8
+            span: 24
           }
         ]
       },

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

@@ -5,8 +5,8 @@
   "index": true,
   "viewBtn": false,
   "editBtn": false,
-  "addBtn":false,
-  "delBtn":false,
+  "addBtn": false,
+  "delBtn": false,
   "align": "center",
   "menuWidth": 150,
   "refreshBtn": false,
@@ -15,29 +15,29 @@
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 1,
-      "width": 80,
-      "overHidden":true
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "width": 80,
-      "overHidden":true
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "width": 80,
-      "overHidden":true
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
-      "width": 80,
-      "overHidden":true,
+      "width": 100,
+      "overHidden": true,
       "cell": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=product_properties",
@@ -47,90 +47,89 @@
       }
     },
     {
-      "label": "产品照片",
-      "prop": "itemUrl",
-      "index": 5,
-      "width": 80,
-      "overHidden":true,
-      "hide":true
-    },
-    {
       "label": "产品描述",
       "prop": "itemDescription",
-      "index": 6,
-      "width": 80,
-      "overHidden":true,
+      "index": 5,
+      "width": 100,
+      "overHidden": true,
       "cell": true
     },
     {
       "label": "产品型号",
       "prop": "itemType",
+      "index": 6,
+      "width": 100
+    },
+    {
+      "label": "采购单价",
+      "prop": "purchaseAmount",
       "index": 7,
-      "width": 80
+      "width": 100,
+      "overHidden": true
     },
     {
-      "label": "数量",
-      "prop": "orderQuantity",
+      "label": "供应商",
+      "prop": "corpId",
       "index": 8,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
-      "label": "计价单位",
-      "prop": "unit",
+      "label": "重点推荐",
+      "prop": "priorityReferrer",
       "index": 9,
-      "width": 80,
-      "overHidden":true,
-      "cell": true,
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
-      "props": {
-        "label": "dictValue",
-        "value": "dictValue"
-      }
+      "width": 100,
+      "overHidden": true
     },
     {
-      "label": "价格条款",
-      "prop": "tradeTerms",
+      "label": "推荐理由",
+      "prop": "referrerReason",
       "index": 10,
-      "width": 80,
-      "overHidden":true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 11,
+      "width": 100,
+      "overHidden": true,
       "cell": true,
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
       "props": {
         "label": "dictValue",
-        "value": "dictKey"
+        "value": "dictValue"
       }
     },
     {
-      "label": "单价",
-      "prop": "price",
-      "index": 11,
+      "label": "数量",
+      "prop": "orderQuantity",
+      "index": 12,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 12,
+      "index": 13,
       "width": 100,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 13,
+      "index": 14,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 14,
+      "index": 15,
       "width": 100,
-      "overHidden":true,
+      "overHidden": true,
       "cell": true
     }
   ]

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

@@ -9,6 +9,8 @@
   "addBtn": false,
   "align": "center",
   "menuWidth": "180",
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -12,10 +12,17 @@
         </el-button>
       </div>
       <el-button
-        class="el-button--small-yh add-customer-btn"
+        class="submit-customer-btn"
         type="primary"
         :disabled="disabled"
-        @click="editCustomer"
+        @click="editCustomer('submit')"
+        >提交
+      </el-button>
+      <el-button
+        class="add-customer-btn"
+        type="primary"
+        :disabled="disabled"
+        @click="editCustomer('save')"
         >{{ form.id ? "确认修改" : "确认新增" }}
       </el-button>
     </div>
@@ -103,6 +110,32 @@
             </el-select>
             <span v-else>{{ row.itemType }}</span>
           </template>
+          <template slot="priorityReferrer" slot-scope="{ row }">
+            <el-checkbox
+              :disabled="!row.$cellEdit"
+              v-model="row.priorityReferrer"
+              :true-label="1"
+              :false-label="0"
+            />
+          </template>
+          <template slot="corpId" slot-scope="{ row, index }">
+            <customer-dialog
+              v-if="row.$cellEdit"
+              v-model="row.corpName"
+              :cropIndex="index"
+              @getcorpId="getcorpId"
+            ></customer-dialog>
+            <span v-else>{{ row.corpName }}</span>
+          </template>
+          <template slot="purchaseAmount" slot-scope="{ row }">
+            <el-input
+              v-if="row.$cellEdit"
+              v-model="row.purchaseAmount"
+              size="small"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+            ></el-input>
+            <span v-else>{{ row.purchaseAmount | micrometerFormat }}</span>
+          </template>
           <template slot="menuLeft">
             <el-button
               type="primary"
@@ -208,11 +241,13 @@ import {
   delItem,
   getDeptLazyTree,
   getGoods,
-  getPorts,
-  getSpecification
+  getSpecification,
+  submitMessage
 } from "@/api/basicData/purchaseInquiry";
+import customerDialog from "@/components/customer-dialog/main";
 import reportDialog from "@/components/report-dialog/main";
 import { micrometerFormat } from "@/util/validate";
+import { contrastObj, contrastList } from "@/util/contrastData";
 import _ from "lodash";
 export default {
   name: "detailsPageEdit",
@@ -306,14 +341,14 @@ export default {
           },
           {
             label: "采购备注",
-            prop: "orderRemark",
+            prop: "purchaseRemark",
             type: "textarea",
             minRows: 2,
             span: 8
           },
           {
             label: "船务备注",
-            prop: "orderRemark",
+            prop: "shippingRemark",
             type: "textarea",
             minRows: 2,
             span: 8
@@ -365,7 +400,8 @@ export default {
     }
   },
   components: {
-    reportDialog
+    reportDialog,
+    customerDialog
   },
   async created() {
     this.tableOption = await this.getColumnData(
@@ -401,13 +437,12 @@ export default {
         };
       }
     });
-    getPorts().then(res => {
-      this.findObject(this.option.column, "portOfLoad").dicData = res.data;
-      this.findObject(this.option.column, "portOfDestination").dicData =
-        res.data;
-    });
   },
   methods: {
+    getcorpId(row) {
+      console.log(row);
+      this.data[row.index].corpId = row.id;
+    },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
         this.$set(row, "$cellEdit", false);
@@ -526,21 +561,43 @@ export default {
       console.log(id);
       detail(id).then(res => {
         this.form = res.data.data;
-        this.data = res.data.data.itemsVOList ? res.data.data.itemsVOList : [];
+        this.data = res.data.data.orderItemsList
+          ? res.data.data.orderItemsList
+          : [];
         this.configuration.dicData = this.form.corpsName;
       });
     },
     //修改提交触发
-    editCustomer() {
+    editCustomer(status) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          submit({
-            ...this.form,
-            orderItemsList: this.data
-          }).then(res => {
-            this.$message.success(this.form.id ? "修改成功" : "提交成功");
-          });
+          if (status == "save") {
+            submit({
+              ...this.form,
+              orderItemsList: this.data,
+            }).then(res => {
+              this.form = res.data.data;
+              this.data = res.data.data.orderItemsList
+                ? res.data.data.orderItemsList
+                : [];
+              this.configuration.dicData = this.form.corpsName;
+              this.$message.success("修改成功");
+            });
+          }
+          if (status == "submit") {
+            submitMessage({
+              ...this.form,
+              orderItemsList: this.data
+            }).then(res => {
+              this.form = res.data.data;
+              this.data = res.data.data.orderItemsList
+                ? res.data.data.orderItemsList
+                : [];
+              this.configuration.dicData = this.form.corpsName;
+              this.$message.success("提交成功");
+            });
+          }
         } else {
           return false;
         }
@@ -637,6 +694,11 @@ export default {
   right: 140px;
   top: 115px;
 }
+.submit-customer-btn {
+  position: fixed;
+  right: 140px;
+  top: 115px;
+}
 .add-customer-btn {
   position: fixed;
   right: 36px;

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

@@ -11,6 +11,8 @@
   "menuWidth": "180",
   "searchLabelWidth": "90",
   "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",

src/views/exportTrade/receipt/detailsPage.vue

@@ -235,6 +235,7 @@ import {
 } from "@/api/exportTrade/receipt";
 import uploadFile from "@/components/upload-file/main";
 import reportDialog from "@/components/report-dialog/main";
+import { contrastObj, contrastList } from "@/util/contrastData";
 import {
   isvalidatemobile,
   validatename,

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

@@ -9,6 +9,8 @@
   "addBtn": false,
   "align": "center",
   "menuWidth": "180",
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",

src/views/exportTrade/salesContract/detailsPage.vue

@@ -337,6 +337,7 @@ import {
 import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import { micrometerFormat } from "@/util/validate";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
   name: "detailsPageEdit",
   data() {
@@ -468,7 +469,7 @@ export default {
           {
             label: "订单日期",
             prop: "businesDate",
-            span: 6,
+            span: 8,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00"
@@ -476,15 +477,16 @@ export default {
           {
             label: "预交日期",
             prop: "dateValidity",
-            span: 6,
+            span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
+            valueFormat: "yyyy-MM-dd 00:00:00",
+            row: true
           },
           {
             label: "币别",
             prop: "currency",
-            span: 6,
+            span: 8,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
             props: {
@@ -495,8 +497,9 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            span: 6,
-            slot: true
+            span: 8,
+            slot: true,
+            row: true
           },
           {
             label: "箱型",
@@ -528,6 +531,18 @@ export default {
             prop: "oceanFreight",
             span: 8
           },
+
+          {
+            label: "毛利额",
+            prop: "grossProfit",
+            span: 8
+          },
+          {
+            label: "毛利率",
+            prop: "grossProfitRate",
+            span: 8,
+            row: true
+          },
           {
             label: "备注",
             prop: "orderRemark",
@@ -548,16 +563,6 @@ export default {
             type: "textarea",
             minRows: 2,
             span: 8
-          },
-          {
-            label: "毛利额",
-            prop: "grossProfit",
-            span: 8
-          },
-          {
-            label: "毛利率",
-            prop: "grossProfitRate",
-            span: 8
           }
         ]
       },

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

@@ -5,42 +5,45 @@
   "index": true,
   "viewBtn": false,
   "editBtn": false,
-  "addBtn":false,
+  "addBtn": false,
+  "delBtn":false,
   "align": "center",
-  "menuWidth": 300,
-  "menu":false,
+  "menuWidth": 150,
   "refreshBtn": false,
   "showSummary": true,
   "column": [{
       "label": "船公司",
-      "prop": "",
+      "prop": "shippingHouse",
       "index": 1,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "船期",
-      "prop": "",
+      "prop": "sailSchedule",
       "index": 2,
-      "overHidden":true
+      "overHidden": true,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd 00:00:00",
+      "cell": true
     },
     {
       "label": "运费",
-      "prop": "",
+      "prop": "oceanFreight",
       "index": 3,
-      "overHidden":true
+      "overHidden": true
     },
     {
       "label": "重点推荐",
-      "prop": "",
-      "index": 14,
-      "overHidden":true,
-      "cell": true
+      "prop": "priorityReferrer",
+      "index": 4,
+      "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 14,
-      "overHidden":true,
+      "index": 5,
+      "overHidden": true,
       "cell": true
     }
   ]

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

@@ -9,6 +9,8 @@
   "addBtn": false,
   "align": "center",
   "menuWidth": "150",
+  "searchIcon": true,
+  "searchIndex": 3,
   "column": [{
       "label": "系统号",
       "prop": "sysNo",

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -16,7 +16,7 @@
         type="primary"
         :disabled="disabled"
         @click="editCustomer"
-        >提 交
+        >{{ form.id ? "确认修改" : "确认提交" }}
       </el-button>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
@@ -53,7 +53,65 @@
           :option="freightOption"
           @row-del="rowDel"
           @saveColumn="saveFreightColumn"
-        />
+        >
+          <template slot="shippingHouse" slot-scope="{ row, index }">
+            <customer-dialog
+              v-if="row.$cellEdit"
+              v-model="row.shippingHouseName"
+              :cropIndex="index"
+              @getcorpId="getcorpId"
+            ></customer-dialog>
+            <span v-else>{{ row.shippingHouseName }}</span>
+          </template>
+          <template slot="priorityReferrer" slot-scope="{ row }">
+            <el-checkbox
+              :disabled="!row.$cellEdit"
+              v-model="row.priorityReferrer"
+              :true-label="1"
+              :false-label="0"
+            />
+          </template>
+          <template slot="oceanFreight" slot-scope="{ row }">
+            <el-input
+              size="small"
+              v-model="row.oceanFreight"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/,
+            "$1.$2")'
+              placeholder="请输入"
+              :disabled="detailData.status == 1"
+              v-if="row.$cellEdit"
+            />
+            <span v-else>{{ row.oceanFreight }}</span>
+          </template>
+          <template slot="menu" slot-scope="{ row, index }">
+            <el-button
+              size="small"
+              icon="el-icon-edit"
+              type="text"
+              @click="rowCell(row, index)"
+              :disabled="disabled"
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
+            >
+            <el-button
+              size="small"
+              icon="el-icon-edit"
+              type="text"
+              @click="rowDel(row, index)"
+              :disabled="detailData.status == 1"
+              >删 除</el-button
+            >
+          </template>
+          <template slot="menuLeft">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="small"
+              @click.stop="addFreight"
+              :disabled="detailData.status == 1"
+              >新增</el-button
+            ></template
+          >
+        </avue-crud>
       </basic-container>
       <fee-info
         ref="feeInfo"
@@ -100,7 +158,6 @@
           </el-col>
         </el-row>
       </span>
-
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button
@@ -125,12 +182,14 @@ import tableOption from "./config/customerContact.json";
 import goodsOption from "./config/commodity.json";
 import freightOption from "./config/freight.json";
 import feeInfo from "@/components/fee-info/main";
+import customerDialog from "@/components/customer-dialog/main";
 import {
   detail,
   submit,
   getDeptLazyTree,
   getGoods,
-  getPorts
+  getPorts,
+  delItem
 } from "@/api/basicData/shippingInquiry";
 import reportDialog from "@/components/report-dialog/main";
 import {
@@ -138,34 +197,11 @@ import {
   validatename,
   micrometerFormat
 } from "@/util/validate";
+import { contrastObj, contrastList } from "@/util/contrastData";
 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,
@@ -178,8 +214,8 @@ export default {
       form: {},
       disabled: false,
       dialogVisible: false,
-      freightOption:freightOption,
-      tableOption:{},
+      freightOption: freightOption,
+      tableOption: {},
       option: {
         menuBtn: false,
         labelWidth: 100,
@@ -267,7 +303,8 @@ export default {
       goodsList: [],
       selectionList: [],
       treeDeptId: null,
-      orderFeesList: []
+      orderFeesList: [],
+      freightData: []
     };
   },
   props: {
@@ -277,7 +314,8 @@ export default {
   },
   components: {
     reportDialog,
-    feeInfo
+    feeInfo,
+    customerDialog
   },
   async created() {
     this.tableOption = await this.getColumnData(
@@ -317,6 +355,39 @@ export default {
     });
   },
   methods: {
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
+    rowDel(row, index) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        if (row.id) {
+          delItem(row.id).then(res => {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.freightData.splice(index, 1);
+          });
+        } else {
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+          this.freightData.splice(index, 1);
+        }
+      });
+    },
+    getcorpId(row) {
+      this.freightData[row.index].shippingHouse = row.id;
+    },
     rateChange(row) {
       if (row >= 100) {
         this.form.exchangeRate = 0;
@@ -384,9 +455,13 @@ export default {
         this.form = res.data.data;
         this.data = res.data.data.itemsVOList;
         this.orderFeesList = res.data.data.orderFeesList;
+        this.freightData = res.data.data.orderFreightList;
         this.configuration.dicData = this.form.corpsName;
       });
     },
+    addFreight() {
+      this.freightData.push({ $cellEdit: true });
+    },
     //修改提交触发
     editCustomer() {
       this.$refs["form"].validate((valid, done) => {
@@ -406,9 +481,15 @@ export default {
           }
           submit({
             id: this.form.id,
-            orderFeesList: orderFeesList
+            orderFeesList: orderFeesList,
+            orderFreightList: this.freightData
           }).then(res => {
             this.$message.success(this.form.id ? "修改成功" : "提交成功");
+            this.form = res.data.data;
+            this.data = res.data.data.itemsVOList;
+            this.orderFeesList = res.data.data.orderFeesList;
+            this.freightData = res.data.data.orderFreightList;
+            this.configuration.dicData = this.form.corpsName;
           });
         } else {
           return false;