修改bug

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

@@ -8,7 +8,7 @@
   "border": true,
   "index": true,
   "refreshBtn": false,
-  "menuWidth": 180,
+  "menuWidth": 130,
   "align":"center",
   "showSummary": true,
   "column": [{

src/components/port-info/index.vue

@@ -1,13 +1,28 @@
 <template>
   <div>
-    <div @click="portinfoVisible = true&&!disabled">
-      <el-input
+    <div style="display:flex">
+      <el-select
         v-model="value"
-        size="small"
-        @input="$emit('balabala', value)"
         placeholder="请选择"
         :disabled="disabled"
-      />
+        @input="$emit('balabala', value)"
+        filterable
+        clearable
+      >
+        <el-option
+          v-for="item in portList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.name"
+        >
+        </el-option>
+      </el-select>
+      <el-button
+        icon="el-icon-search"
+        @click="portinfoVisible = true"
+        :disabled="disabled"
+        size="mini"
+      ></el-button>
     </div>
     <el-dialog
       title="港口信息"
@@ -125,7 +140,8 @@ export default {
         }
       },
       portinfoVisible: false,
-      selectionList: []
+      selectionList: [],
+      portList: []
     };
   },
   props: {
@@ -136,7 +152,11 @@ export default {
     prop: "value",
     event: "balabala"
   },
-  created() {},
+  created() {
+    getList().then(res => {
+      this.portList = res.data.data.records;
+    });
+  },
   components: {
     reportDialog
   },

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

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn": false,
   "align": "center",
-  "menuWidth": 150,
+  "menuWidth": 130,
   "refreshBtn": false,
   "showSummary": true,
   "column": [{

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

@@ -1,213 +0,0 @@
-{
-  "border": true,
-  "searchMenuSpan": 8,
-  "index": true,
-  "viewBtn": false,
-  "editBtn": false,
-  "delBtn": false,
-  "addBtn": false,
-  "menu": false,
-  "align": "center",
-  "menuWidth": "180",
-  "selection": true,
-  "tip": false,
-  "column": [{
-      "label": "商品名称",
-      "search": true,
-      "searchSpan": 8,
-      "prop": "cname",
-      "index": 1,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "规格",
-      "prop": "specs",
-      "index": 2,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "产品属性",
-      "prop": "goodNature",
-      "index": 3,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "供应商",
-      "prop": "corpId",
-      "index": 4,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "币别",
-      "prop": "currency",
-      "index": 5,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "汇率",
-      "prop": "exchangeRate",
-      "width": 100,
-      "index": 6,
-      "overHidden": true
-    },
-    {
-      "label": "FOB系数",
-      "prop": "coefficient",
-      "index": 7,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "价格类型",
-      "prop": "billType",
-      "index": 8,
-      "width": 100,
-      "overHidden": true,
-      "dicData": [],
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      }
-    },
-    {
-      "label": "最新价格",
-      "prop": "price",
-      "index": 9,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "美元价格",
-      "prop": "greenback",
-      "index": 10,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "采购价格",
-      "prop": "purchaseAmount",
-      "index": 11,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "税率",
-      "prop": "taxRate",
-      "index": 12,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "商品类别",
-      "prop": "goodsTypeName",
-      "search": true,
-      "searchSpan": 8,
-      "index": 13,
-      "width": 100,
-      "type": "select",
-      "filterable": true,
-      "dicData": [],
-      "props": {
-        "value": "cname",
-        "label": "cname"
-      },
-      "overHidden": true
-    },
-    {
-      "label": "是否重点推荐",
-      "prop": "priorityReferrer",
-      "index": 14,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "推荐理由",
-      "prop": "referrerReason",
-      "index": 15,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "历史价格1",
-      "prop": "priceOne",
-      "index": 16,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "历史日期1",
-      "prop": "priceOneTime",
-      "index": 17,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "历史价格2",
-      "prop": "priceTwo",
-      "index": 18,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "历史日期2",
-      "prop": "priceTwoTime",
-      "index": 19,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "历史价格3",
-      "prop": "priceThree",
-      "index": 20,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "历史日期3",
-      "prop": "priceThreeTime",
-      "index": 21,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "备注",
-      "prop": "remarks",
-      "index": 22,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "有效期开始",
-      "prop": "startTime",
-      "index": 23,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "有效期结束",
-      "prop": "endTime",
-      "index": 24,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "业务员",
-      "prop": "person",
-      "index": 25,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "状态",
-      "prop": "status",
-      "index": 26,
-      "width": 100,
-      "overHidden": true
-    }
-  ]
-}

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -623,6 +623,12 @@ export default {
           {
             label: "箱型",
             prop: "boxPile",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             span: 8
           },
           {
@@ -1125,7 +1131,7 @@ export default {
           rows.forEach(e => {
             this.partList.forEach((item, index) => {
               if (index == this.partreData.index) {
-                item.goodId = e.id;
+                item.goodId = e.itemId;
                 item.goodTypeId = e.goodTypeId;
                 item.goodTypeName = e.goodsTypeName;
                 item.goodName = e.cname;
@@ -1145,7 +1151,7 @@ export default {
         } else {
           rows.forEach(e => {
             this.partList.push({
-              goodId: e.id,
+              goodId: e.itemId,
               goodTypeId: e.goodTypeId,
               goodTypeName: e.goodsTypeName,
               goodName: e.cname,
@@ -1159,7 +1165,7 @@ export default {
       } else {
         rows.forEach(e => {
           this.data.push({
-            itemId: e.id,
+            itemId: e.itemId,
             code: e.code,
             cname: e.cname,
             priceCategory: e.goodsTypeName,

src/views/exportTrade/customerInquiry/index.vue

@@ -155,6 +155,7 @@ export default {
      * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
      */
     this.option = await this.getColumnData(this.getColumnName(0), option);
+    console.log(this.option)
     this.getWorkDicts("order_status").then(res => {
       this.findObject(this.option.column, "orderStatus").dicData =
         res.data.data;

src/views/exportTrade/customerInquiry/priceLibrary.vue

@@ -1,160 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      title="出口价格库"
-      class="el-dialogDeep"
-      :visible.sync="visible"
-      width="60%"
-      append-to-body
-      @closed="closed"
-      v-dialog-drag
-    >
-      <span>
-        <avue-crud
-          ref="crud"
-          :data="data"
-          :option="tableOption"
-          :page.sync="page"
-          :search.sync="search"
-          @search-change="searchChange"
-          @current-change="currentChange"
-          @size-change="sizeChange"
-          @refresh-change="refreshChange"
-          @on-load="getList"
-          @saveColumn="saveColumn"
-          @selection-change="selectionChange"
-          :cell-style="cellStyle"
-          :table-loading="loading"
-        >
-          <template slot="cnameSearch">
-            <goods-select
-              v-model="search.cname"
-              :configuration="goodsConfiguration"
-            />
-          </template>
-          <template slot="corpId" slot-scope="{ row }">
-            <span>{{ row.corpName }}</span>
-          </template>
-        </avue-crud>
-      </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false">取 消</el-button>
-        <el-button
-          type="primary"
-          @click="importData"
-          :disabled="selectionList.length == 0"
-          >导 入</el-button
-        >
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import option from "./config/priceLibrary.json";
-import { getPricebank, getGoodstype } from "@/api/basicData/customerInquiry";
-import { dateFormat } from "@/util/date";
-import _ from "lodash";
-export default {
-  data() {
-    return {
-      visible: false,
-      loading: true,
-      data: [],
-      search: {},
-      tableOption: option,
-      height: window.innerHeight - 500,
-      page: {
-        currentPage: 1,
-        total: 0,
-        pageSize: 10
-      },
-      selectionList: [],
-      goodsConfiguration: {
-        multipleChoices: false,
-        multiple: false,
-        collapseTags: false,
-        placeholder: "请点击右边按钮选择",
-        dicData: [],
-        clearable: true
-      },
-      partType: false,
-      partreData: false
-    };
-  },
-  props: {},
-  filters: {},
-  created() {
-    getGoodstype(1, 500).then(res => {
-      this.findObject(this.tableOption.column, "goodsTypeName").dicData =
-        res.data.data.records;
-    });
-  },
-  methods: {
-    init(status, partreData) {
-      this.partType = status;
-      this.partreData = partreData;
-      this.visible = true;
-      this.getList(this.page, this.search);
-    },
-    cellStyle() {
-      return "padding:0;height:40px;";
-    },
-    importData() {
-      if (this.partreData) {
-        if (this.selectionList.length != 1) {
-          return this.$message.error("重新选择的时候只能选择一条数据");
-        }
-      }
-      this.visible = false;
-      this.$emit("importLibray", this.selectionList, this.partType);
-    },
-    currentChange(val) {
-      this.page.currentPage = val;
-    },
-    sizeChange(val) {
-      this.page.currentPage = 1;
-      this.page.pageSize = val;
-    },
-    //点击搜索按钮触发
-    searchChange(params, done) {
-      if (params.dateValidity) {
-        params.dateValidityStart = params.dateValidity[0];
-        params.dateValidityEnd = params.dateValidity[1];
-      }
-      delete params.dateValidity;
-      this.getList(this.page, params);
-      done();
-    },
-    getList(page, params) {
-      const data = {
-        ...params,
-        billType: "CG",
-        statusTime: dateFormat(new Date(), "yyyy-MM-dd")
-      };
-      this.loading = true;
-      getPricebank(page.currentPage, page.pageSize, data)
-        .then(res => {
-          this.data = res.data.data.records ? res.data.data.records : [];
-          this.page.total = res.data.data.total;
-          if (this.page.total > 0) {
-            this.tableOption.height = window.innerHeight - 500;
-          }
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    closed() {
-      this.partreData = null;
-      this.$refs.crud.toggleSelection();
-    }
-  },
-  watch: {}
-};
-</script>
-
-<style scoped lang="scss"></style>

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

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

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

@@ -9,7 +9,7 @@
   "addBtn": false,
   "delBtn": false,
   "align": "center",
-  "menuWidth": 150,
+  "menuWidth": 130,
   "refreshBtn": false,
   "selection": true,
   "showSummary": true,

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

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn": false,
   "align": "center",
-  "menuWidth": 150,
+  "menuWidth": 130,
   "refreshBtn": false,
   "showSummary": true,
   "column": [{
@@ -29,7 +29,7 @@
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "width": 100,
+      "width": 200,
       "overHidden": true
     },
     {
@@ -40,7 +40,7 @@
       "overHidden": true,
       "cell": true,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "dictValue",
         "value": "dictKey"
@@ -61,66 +61,100 @@
       "width": 100
     },
     {
-      "label": "采购单价",
-      "prop": "purchaseAmount",
+      "label": "单价",
+      "prop": "price",
       "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "供应商",
-      "prop": "corpId",
+      "label": "税率",
+      "prop": "taxRate",
       "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "重点推荐",
-      "prop": "priorityReferrer",
+      "label": "FOB系数",
+      "prop": "coefficient",
       "index": 9,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "推荐理由",
-      "prop": "referrerReason",
+      "label": "供应商",
+      "prop": "corpId",
       "index": 10,
       "width": 100,
-      "overHidden": true,
-      "cell": true
+      "overHidden": true
+    },
+    {
+      "label": "采购单价",
+      "prop": "purchaseAmount",
+      "index": 13,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "数量",
+      "prop": "orderQuantity",
+      "index": 15,
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 11,
+      "index": 14,
       "width": 100,
       "overHidden": true,
       "cell": true,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "dictValue",
         "value": "dictValue"
       }
     },
     {
-      "label": "数量",
-      "prop": "orderQuantity",
-      "index": 12,
+      "label": "金额",
+      "prop": "amount",
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "金额",
-      "prop": "amount",
-      "index": 13,
+      "label": "币别",
+      "prop": "currency",
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "税率",
-      "prop": "taxRate",
-      "index": 14,
+      "label": "汇率",
+      "prop": "exchangeRate",
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "美元价格",
+      "prop": "greenback",
+      "index": 19,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "重点推荐",
+      "prop": "priorityReferrer",
+      "index": 11,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "推荐理由",
+      "prop": "referrerReason",
+      "index": 12,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -128,7 +162,7 @@
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 15,
+      "index": 20,
       "width": 100,
       "overHidden": true,
       "cell": true

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -58,18 +58,33 @@
           @row-del="rowDel"
           @saveColumn="saveColumn"
           :summary-method="summaryMethod"
+          :cell-style="cellStyle"
         >
           <template slot="cname" slot-scope="{ row, index }">
-            <el-button
-              size="small"
-              type="text"
-              @click="rePick(row, index)"
-              :disabled="detailData.status == 1"
-              class="picker"
-              style="padding:4px 10px;float:left"
-              >选择</el-button
-            >
-            <span> {{ row.cname }}</span>
+            <span v-if="row.$cellEdit" style="display:flex">
+              <el-select
+                v-model="row.cname"
+                placeholder="请选择"
+                size="small"
+                style="width:60%"
+                @change="cnameChange(row, index)"
+              >
+                <el-option
+                  v-for="item in goodsoptions"
+                  :key="item.id"
+                  :label="item.cname"
+                  :value="item.cname"
+                >
+                </el-option>
+              </el-select>
+              <el-button
+                icon="el-icon-search"
+                size="mini"
+                @click="rePick(row, index)"
+              ></el-button>
+            </span>
+
+            <span v-else> {{ row.cname }}</span>
           </template>
           <template slot="price" slot-scope="{ row }">
             <el-input
@@ -81,6 +96,44 @@
             ></el-input>
             <span v-else>{{ row.price }}</span>
           </template>
+          <template slot="taxRate" slot-scope="{ row }">
+            <el-input
+              v-if="row.$cellEdit"
+              v-model="row.taxRate"
+              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.taxRate ? row.taxRate : 0 }}%</span>
+          </template>
+          <template slot="coefficient" slot-scope="{ row }">
+            <el-input
+              v-if="row.$cellEdit"
+              v-model="row.coefficient"
+              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.coefficient ? row.coefficient : 0 }}%</span>
+          </template>
+          <template slot="currency" slot-scope="{ row }">
+            <el-select
+              v-if="row.$cellEdit"
+              v-model="row.currency"
+              placeholder="请选择"
+              size="small"
+              @change="currencyChange(row)"
+            >
+              <el-option
+                v-for="(item, index) in currencyList"
+                :key="index"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+            <span v-else>{{ row.currency }}</span>
+          </template>
           <template slot="orderQuantity" slot-scope="{ row }">
             <el-input
               v-if="row.$cellEdit"
@@ -99,6 +152,7 @@
               allow-create
               default-first-option
               placeholder="请输入"
+              size="small"
               @focus="itemTypeFocus(row)"
             >
               <el-option
@@ -129,13 +183,7 @@
             <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>
+            <span>{{ row.purchaseAmount | micrometerFormat }}</span>
           </template>
           <template slot="menuLeft">
             <el-button
@@ -278,13 +326,6 @@ export default {
           {
             label: "客户名称",
             prop: "corpId",
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ],
             span: 16,
             slot: true
           },
@@ -419,7 +460,9 @@ export default {
       olddata: [],
       subLoading: false,
       pageLoading: false,
-      showBut: true
+      showBut: true,
+      goodsoptions: [],
+      currencyList: []
     };
   },
   props: {
@@ -453,6 +496,12 @@ export default {
     this.getWorkDicts("unit").then(res => {
       this.findObject(this.tableOption.column, "unit").dicData = res.data.data;
     });
+    this.getWorkDicts("currency").then(res => {
+      this.currencyList = res.data.data;
+    });
+    getGoods().then(res => {
+      this.goodsoptions = res.data.data.records;
+    });
   },
   methods: {
     cellStyle() {
@@ -465,6 +514,18 @@ export default {
       };
       this.newDetails();
     },
+    cnameChange(row) {
+      this.goodsoptions.forEach(e => {
+        if (e.cname == row.cname) {
+          row.itemId = e.id;
+          row.code = e.code;
+          row.priceCategory = e.goodsTypeName;
+          row.itemUrl = e.url;
+          row.itemDescription = e.cnameDescription;
+          row.unit = e.unit;
+        }
+      });
+    },
     getcorpId(row) {
       console.log(row);
       this.data[row.index].corpId = row.id;
@@ -484,18 +545,45 @@ export default {
       });
     },
     priceChange(row) {
-      console.log(row);
       if (!row.price) {
         row.price = 0;
       } else {
-        row.amount = _.multiply(row.price, row.orderQuantity).toFixed(2);
+        row.purchaseAmount = Number(
+          _.divide(
+            Number(row.price ? row.price : 0),
+            _.multiply(
+              _.add(1, _.divide(Number(row.taxRate ? row.taxRate : 0), 100)),
+              _.add(
+                1,
+                _.divide(Number(row.coefficient ? row.coefficient : 0), 100)
+              )
+            )
+          )
+        ).toFixed(2);
+        row.amount = Number(
+          _.multiply(
+            _.divide(
+              Number(row.price ? row.price : 0),
+              _.multiply(
+                _.add(1, _.divide(Number(row.taxRate ? row.taxRate : 0), 100)),
+                _.add(
+                  1,
+                  _.divide(Number(row.coefficient ? row.coefficient : 0), 100)
+                )
+              )
+            ),
+            row.orderQuantity
+          )
+        ).toFixed(2);
       }
     },
     quantityChange(row) {
       if (!row.orderQuantity) {
         row.orderQuantity = 0;
       } else {
-        row.amount = _.multiply(row.price, row.orderQuantity).toFixed(2);
+        row.amount = _.multiply(row.purchaseAmount, row.orderQuantity).toFixed(
+          2
+        );
       }
     },
     rowSave(row) {
@@ -569,6 +657,7 @@ export default {
             freight: 0,
             discount: null,
             amount: 0,
+            coefficient: 0,
             taxRate: 0,
             unit: e.unit,
             remarks: null,
@@ -583,6 +672,14 @@ export default {
       this.treeDeptId = "";
       this.reData = null;
     },
+    currencyChange(row) {
+      if (row.currency == "CNY") {
+        row.exchangeRate = 1;
+      }
+      if (row.currency == "USD") {
+        row.exchangeRate = 6.3843;
+      }
+    },
     selectionChange(list) {
       this.selectionList = list;
     },

src/views/exportTrade/purchaseInquiry/index.vue

@@ -19,6 +19,13 @@
         :cell-style="cellStyle"
       >
         <template slot="menuLeft">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            @click.stop="newAdd()"
+            >新单</el-button
+          >
           <el-button type="info" size="small">报表</el-button>
         </template>
         <template slot="corpIdSearch">
@@ -124,7 +131,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes:[10,50,100,200,300,400,500]
+        pageSizes: [10, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},

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

@@ -7,7 +7,7 @@
   "editBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": 150,
+  "menuWidth": 130,
   "refreshBtn": false,
   "delBtn":false,
   "addBtnText": "新增明细",

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

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn": false,
   "align": "center",
-  "menuWidth": 150,
+  "menuWidth": 130,
   "refreshBtn": false,
   "showSummary": true,
   "selection": true,

src/views/exportTrade/salesContract/detailsPage.vue

@@ -658,6 +658,12 @@ export default {
           {
             label: "箱型",
             prop: "boxPile",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             span: 8
           },
           {
@@ -1170,7 +1176,7 @@ export default {
           rows.forEach(e => {
             this.partList.forEach((item, index) => {
               if (index == this.partreData.index) {
-                item.goodId = e.id;
+                item.goodId = e.itemId;
                 item.goodTypeId = e.goodTypeId;
                 item.goodTypeName = e.goodsTypeName;
                 item.goodName = e.cname;
@@ -1189,7 +1195,7 @@ export default {
         } else {
           rows.forEach(e => {
             this.partList.push({
-              goodId: e.id,
+              goodId: e.itemId,
               goodTypeId: e.goodTypeId,
               goodTypeName: e.goodsTypeName,
               goodName: e.cname,
@@ -1203,7 +1209,7 @@ export default {
       } else {
         rows.forEach(e => {
           this.data.push({
-            itemId: e.id,
+            itemId: e.itemId,
             code: e.code,
             cname: e.cname,
             priceCategory: e.goodsTypeName,
@@ -1375,7 +1381,7 @@ export default {
               e.contractAmount = e.amount;
               e.srcId = e.id;
               e.specificationAndModel = e.itemType;
-              e.productDesc=e.itemDescription
+              e.productDesc = e.itemDescription;
               delete e.id;
               delete e.version;
               delete e.status;
@@ -1385,24 +1391,21 @@ export default {
               delete e.updateTime;
               delete e.isDeleted;
             });
-            delete data.id;
-            delete data.version;
-            delete data.status;
-            delete data.createUser;
-            delete data.createTime;
-            delete data.updateUser;
-            delete data.updateTime;
-            delete data.isDeleted;
-            delete data.orderStatus;
-            data.deliveryStatus = "录入";
-            data.srcOrderNo = data.sysNo;
-            delete data.sysNo;
+            console.log(data);
+            const obj = {
+              corpId: data.corpId,
+              deliveryStatus: "录入",
+              srcOrderNo: data.sysNo,
+              orgOrderNo: data.orgOrderNo,
+              orderItemsList: data.orderItemsList,
+              orderFeesList: data.deliveryFeesList
+            };
             this.$router.$avueRouter.closeTag("/exportTrade/invoice/index");
             this.$router.push({
               path: "/exportTrade/invoice/index",
               query: {
                 pageType: "Generate",
-                data: JSON.stringify(data)
+                data: JSON.stringify(obj)
               }
             });
           }

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

@@ -7,7 +7,6 @@
   "editBtn": false,
   "addBtn":false,
   "align": "center",
-  "menuWidth": 120,
   "menu":false,
   "refreshBtn": false,
   "showSummary": true,

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -38,7 +38,20 @@
           ref="form"
           v-model="form"
           :option="option"
-        />
+        >
+          <template slot="portOfLoad">
+            <port-info
+              v-model="form.portOfLoad"
+              :disabled="true"
+            />
+          </template>
+          <template slot="portOfDestination">
+            <port-info
+              v-model="form.portOfDestination"
+              :disabled="true"
+            />
+          </template>
+        </avue-form>
       </basic-container>
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
@@ -277,6 +290,12 @@ export default {
           {
             label: "箱型",
             prop: "boxPile",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             span: 8
           },
           {