修改bug

src/page/index/logo.vue

@@ -1,16 +1,15 @@
 <template>
   <div class="avue-logo">
     <transition name="fade">
-      <span v-if="keyCollapse"
-            class="avue-logo_subtitle"
-            key="0">
-        {{website.logo}}
+      <span v-if="keyCollapse" class="avue-logo_subtitle" key="0">
+        {{ website.logo }}
       </span>
     </transition>
     <transition-group name="fade">
       <template v-if="!keyCollapse">
-        <span class="avue-logo_title"
-              key="1">{{website.indexTitle}} </span>
+        <span class="avue-logo_title" key="1" @click="goHome"
+          >{{ website.indexTitle }}
+        </span>
       </template>
     </transition-group>
   </div>
@@ -27,7 +26,13 @@ export default {
   computed: {
     ...mapGetters(["website", "keyCollapse"])
   },
-  methods: {}
+  methods: {
+    goHome() {
+      this.$router.push({
+        path: "/wel/index"
+      });
+    }
+  }
 };
 </script>
 
@@ -70,4 +75,4 @@ export default {
     color: #fff;
   }
 }
-</style>
+</style>

src/util/columnSetting.js

@@ -12,7 +12,6 @@ export async function getColumnData(columnKey, mainOption) {
     let res = await getColumn({
       fileName: columnKey
     })
-    console.log(res.data.data)
     option = res.data.data ? JSON.parse(res.data.data.jsonMessage)?JSON.parse(res.data.data.jsonMessage):mainOption: mainOption;
     localStorage.setItem(columnKey, JSON.stringify(option));
   }

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

@@ -70,35 +70,51 @@
     {
       "label": "配件信息",
       "prop": "partsList",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "配件描述",
+      "prop": "partsDescribe",
+      "index": 9,
+      "width": 120,
+      "overHidden": true,
+      "cell": true
+    },
+    {
       "label": "配件价格",
       "prop": "partsPrice",
-      "index": 7,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "配件价格描述",
+      "prop": "partsPriceDescribe",
+      "index": 11,
+      "width": 120,
+      "overHidden": true,
+      "cell": true
+    },
+    {
       "label": "供应商",
       "prop": "corpId",
-      "index": 8,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "重点推荐",
       "prop": "priorityReferrer",
-      "index": 9,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "推荐理由",
       "prop": "referrerReason",
-      "index": 10,
+      "index": 14,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -106,14 +122,14 @@
     {
       "label": "销售价",
       "prop": "price",
-      "index": 11,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 12,
+      "index": 16,
       "width": 100,
       "overHidden": true,
       "cell": true,
@@ -127,49 +143,49 @@
     {
       "label": "数量",
       "prop": "orderQuantity",
-      "index": 13,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "保险",
       "prop": "insurance",
-      "index": 14,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "运费",
       "prop": "freight",
-      "index": 15,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "折扣",
       "prop": "discount",
-      "index": 16,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 17,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 18,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 19,
+      "index": 23,
       "width": 100,
       "overHidden": true,
       "cell": true

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 8,
   "border": true,
@@ -13,12 +12,14 @@
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
+  "selection": true,
+  "tip":false,
   "column": [{
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 1,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -27,7 +28,7 @@
       "prop": "businesDate",
       "search": true,
       "index": 2,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
       "type": "date",
@@ -38,7 +39,7 @@
       "prop": "dateValidity",
       "search": true,
       "index": 3,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
       "type": "date",
@@ -48,35 +49,35 @@
       "label": "价格条款",
       "prop": "priceTerms",
       "index": 4,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "收款方式",
       "prop": "paymentType",
       "index": 5,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "运输方式",
       "prop": "transport",
       "index": 6,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "箱型",
       "prop": "boxPile",
       "index": 7,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "箱量",
       "prop": "boxNumber",
       "index": 8,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -84,7 +85,7 @@
       "prop": "orderStatus",
       "search": true,
       "index": 9,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "type": "select",
       "props": {
@@ -98,7 +99,7 @@
       "prop": "portOfLoad",
       "search": true,
       "index": 10,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -107,7 +108,7 @@
       "prop": "portOfDestination",
       "search": true,
       "index": 11,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "type": "select",
       "filterable": true,
@@ -122,35 +123,35 @@
       "label": "数量合计",
       "prop": "orderQuantity",
       "index": 12,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "毛利额",
       "prop": "grossProfit",
       "index": 13,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "毛利率",
       "prop": "grossProfitRate",
       "index": 14,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售金额",
       "prop": "amount",
       "index": 15,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "采购金额",
       "prop": "purchaseAmount",
       "index": 16,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -158,7 +159,7 @@
       "prop": "",
       "search": true,
       "index": 17,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "hide": true,
       "showColumn": false,
@@ -169,7 +170,7 @@
       "prop": "sysNo",
       "search": true,
       "index": 17,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -177,7 +178,7 @@
       "label": "制单人",
       "prop": "createUser",
       "index": 18,
-      "width": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "type": "select",
@@ -193,7 +194,7 @@
       "label": "制单日期",
       "prop": "createTime",
       "index": 19,
-      "width": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8,
@@ -204,7 +205,7 @@
       "label": "备注",
       "prop": "orderRemark",
       "index": 20,
-      "width": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8
@@ -213,14 +214,14 @@
       "label": "采购备注",
       "prop": "purchaseRemark",
       "index": 21,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售备注",
       "prop": "shippingRemark",
       "index": 20,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -31,7 +31,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option"
+        >
           <template slot="portOfLoad">
             <port-info
               v-model="form.portOfLoad"
@@ -112,6 +117,7 @@
           @row-del="rowDel"
           :summary-method="summaryMethod"
           @saveColumn="saveColumn"
+          :cell-style="cellStyle"
         >
           <template slot="menuLeft">
             <el-button
@@ -370,6 +376,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -744,6 +751,9 @@ export default {
     priceLibrary
   },
   async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(1),
       tableOption
@@ -752,9 +762,7 @@ export default {
       this.getColumnName(26),
       goodsOption
     );
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
+
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
@@ -786,6 +794,9 @@ export default {
     }
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     addLibrary() {
       this.$refs.library.init();
     },
@@ -1333,7 +1344,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/customerInquiry/index.vue

@@ -259,7 +259,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 390;
+            this.option.height = window.innerHeight - 350;
           }
         })
         .finally(() => {

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 24,
   "border": true,
@@ -14,11 +13,13 @@
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
+  "selection": true,
+  "tip":false,
   "column": [{
       "label": "销售订单号",
       "prop": "orgOrderNo",
       "index": 1,
-      "width": 120,
+      "minWidth": 100,
       "overHidden": true,
       "search": true,
       "searchSpan": 8
@@ -29,7 +30,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 2,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd"
@@ -40,7 +41,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 3,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -49,7 +50,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 4,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -57,7 +58,7 @@
       "prop": "",
       "search": true,
       "index": 5,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true,
       "hide": true,
       "showColumn": false,
@@ -69,21 +70,21 @@
       "search": true,
       "searchSpan": 8,
       "index": 6,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "出库数量",
       "prop": "totalQuantity",
       "index": 7,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "出库金额",
       "prop": "deliveryAmount",
       "index": 8,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -92,7 +93,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 9,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -101,7 +102,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 10,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -110,7 +111,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 11,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -119,14 +120,14 @@
       "search": true,
       "searchSpan": 8,
       "index": 12,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 13,
-      "width": 120,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8,
@@ -137,7 +138,7 @@
       "label": "制单人",
       "prop": "createUser",
       "index": 14,
-      "width": 120,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "type": "select",

src/views/exportTrade/invoice/detailsPage.vue

@@ -43,7 +43,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option"
+        >
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
@@ -69,6 +74,7 @@
           @row-del="rowDel"
           @saveColumn="saveColumn"
           :summary-method="summaryMethod"
+          :cell-style="cellStyle"
         >
           <template slot="menuLeft">
             <el-button
@@ -221,6 +227,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -467,6 +474,12 @@ export default {
     uploadFile
   },
   async created() {
+    if (this.$route.query.pageType == "Generate") {
+      this.getGenerate(JSON.parse(this.$route.query.data));
+    }
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(9),
       tableOption
@@ -475,12 +488,6 @@ export default {
       this.getColumnName(30),
       goodsOption
     );
-    if (this.$route.query.pageType == "Generate") {
-      this.getGenerate(JSON.parse(this.$route.query.data));
-    }
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
@@ -512,6 +519,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rePick(row, index) {
       this.reData = {
         ...row,
@@ -909,7 +919,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/invoice/index.vue

@@ -255,7 +255,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 440;
+            this.option.height = window.innerHeight - 400;
           }
         })
         .finally(() => {

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 16,
   "border": true,
@@ -13,13 +12,15 @@
   "searchLabelWidth": "90",
   "searchIcon": true,
   "searchIndex": 2,
+  "selection": true,
+  "tip": false,
   "column": [{
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "searchSpan": 8,
       "index": 1,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -28,7 +29,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 2,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd"
@@ -39,7 +40,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 3,
-      "width": 110,
+      "minWidth": 100,
       "overHidden": true
     },
     {
@@ -48,7 +49,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 4,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd"
@@ -58,7 +59,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 5,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd"
@@ -67,7 +68,7 @@
       "label": "付款方式",
       "prop": "paymentType",
       "index": 6,
-      "width": 110,
+      "minWidth": 80,
       "search": true,
       "searchSpan": 8,
       "overHidden": true,
@@ -81,28 +82,28 @@
       "label": "采购金额",
       "prop": "purchaseAmount",
       "index": 7,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "数量合计",
       "prop": "orderQuantity",
       "index": 8,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "收货金额",
       "prop": "",
       "index": 9,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "收货数量",
       "prop": "actualQuantity",
       "index": 10,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -110,7 +111,7 @@
       "prop": "sysNo",
       "search": true,
       "index": 11,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },
@@ -118,23 +119,23 @@
       "label": "制单人",
       "prop": "createUser",
       "index": 12,
-      "width": 110,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "name",
         "value": "id"
       },
-      "filterable":true,
+      "filterable": true,
       "searchSpan": 8
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 13,
-      "width": 110,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8,
@@ -145,7 +146,7 @@
       "label": "备注",
       "prop": "orderRemark",
       "index": 14,
-      "width": 110,
+      "minWidth": 80,
       "overHidden": true,
       "search": true,
       "searchSpan": 8

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -28,7 +28,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option"
+        >
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
@@ -69,6 +74,7 @@
             @selection-change="goodsSelectionChange"
             @saveColumn="saveColumn"
             :summary-method="summaryMethod"
+            :cell-style="cellStyle"
           >
             <template slot="price" slot-scope="{ row }">
               <el-input
@@ -111,6 +117,7 @@
                 default-first-option
                 placeholder="请输入"
                 @focus="itemTypeFocus(row)"
+                size="small"
               >
                 <el-option
                   v-for="(item, index) in itemtypeList"
@@ -185,7 +192,12 @@
       <div>
         <containerTitle title="银行信息"></containerTitle>
         <basic-container>
-          <avue-form ref="form" v-model="form" :option="bankOption" />
+          <avue-form
+            class="trading-form"
+            ref="form"
+            v-model="form"
+            :option="bankOption"
+          />
         </basic-container>
       </div>
     </div>
@@ -224,6 +236,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -550,7 +563,7 @@ export default {
       oldorderFeesList: [],
       oldorderFilesList: [],
       subLoading: false,
-       pageLoading: false,
+      pageLoading: false,
       showBut: true
     };
   },
@@ -565,6 +578,9 @@ export default {
     uploadFile
   },
   async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(3),
       tableOption
@@ -573,9 +589,6 @@ export default {
       this.getColumnName(27),
       goodsOption
     );
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
     if (this.detailData.status == 1) {
       this.option.disabled = true;
       this.bankOption.disabled = true;
@@ -610,6 +623,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rePick(row, index) {
       this.reData = {
         ...row,
@@ -999,7 +1015,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/purchaseContract/index.vue

@@ -248,7 +248,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 390;
+            this.option.height = window.innerHeight - 350;
           }
         })
         .finally(() => {

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 24,
   "border": true,
@@ -13,13 +12,15 @@
   "searchIcon": true,
   "searchIndex": 2,
   "showSummary": true,
+  "selection": true,
+  "tip": false,
   "column": [{
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "searchSpan": 8,
       "index": 1,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -28,7 +29,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 2,
-      "width": 120,
+      "minWidth": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -40,7 +41,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 3,
-      "width": 120,
+      "minWidth": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -52,7 +53,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 4,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true,
       "type": "select",
       "props": {
@@ -64,21 +65,21 @@
       "label": "起运港",
       "prop": "portOfLoad",
       "index": 5,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "目的港",
       "prop": "portOfDestination",
       "index": 6,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "数量合计",
       "prop": "orderQuantity",
       "index": 7,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -86,7 +87,7 @@
       "prop": "",
       "search": true,
       "index": 8,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true,
       "hide": true,
       "showColumn": false,
@@ -98,30 +99,30 @@
       "search": true,
       "searchSpan": 8,
       "index": 9,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "制单人",
       "prop": "createUser",
       "index": 10,
-      "width": 120,
+      "minWidth": 80,
       "search": true,
       "searchSpan": 8,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "name",
         "value": "id"
       },
-      "filterable":true,
+      "filterable": true,
       "overHidden": true
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 11,
-      "width": 120,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8,
@@ -132,7 +133,7 @@
       "label": "备注",
       "prop": "orderRemark",
       "index": 12,
-      "width": 120,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8
@@ -141,14 +142,14 @@
       "label": "采购备注",
       "prop": "purchaseRemark",
       "index": 13,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售备注",
       "prop": "shippingRemark",
       "index": 14,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -34,7 +34,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option"
+        >
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
@@ -413,7 +418,7 @@ export default {
       },
       olddata: [],
       subLoading: false,
-       pageLoading: false,
+      pageLoading: false,
       showBut: true
     };
   },
@@ -427,6 +432,9 @@ export default {
     customerDialog
   },
   async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(11),
       tableOption
@@ -435,9 +443,6 @@ export default {
       this.getColumnName(31),
       goodsOption
     );
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
@@ -469,6 +474,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rePick(row, index) {
       this.reData = {
         ...row,
@@ -777,7 +785,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/purchaseInquiry/index.vue

@@ -241,7 +241,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 390;
+            this.option.height = window.innerHeight - 350;
           }
         })
         .finally(() => {

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 24,
   "border": true,
@@ -14,12 +13,13 @@
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
-  "column": [
-    {
+  "selection": true,
+  "tip": false,
+  "column": [{
       "label": "销售订单号",
       "prop": "orgOrderNo",
       "index": 1,
-      "width": 130,
+      "minWidth": 100,
       "overHidden": true,
       "search": true,
       "searchSpan": 8
@@ -30,7 +30,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 2,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd"
@@ -41,7 +41,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 3,
-      "width": 130,
+      "minWidth": 100,
       "overHidden": true
     },
     {
@@ -50,7 +50,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 2,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -58,7 +58,7 @@
       "prop": "",
       "search": true,
       "index": 5,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true,
       "hide": true,
       "showColumn": false,
@@ -70,21 +70,21 @@
       "search": true,
       "searchSpan": 8,
       "index": 6,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "入库数量",
       "prop": "totalQuantity",
       "index": 7,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "入库金额",
       "prop": "deliveryAmount",
       "index": 8,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -93,7 +93,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 9,
-      "width": 110,
+      "minWidth": 110,
       "overHidden": true
     },
     {
@@ -102,7 +102,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 10,
-      "width": 110,
+      "minWidth": 110,
       "overHidden": true
     },
     {
@@ -111,7 +111,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 11,
-      "width": 110,
+      "minWidth": 110,
       "overHidden": true
     },
     {
@@ -120,14 +120,14 @@
       "search": true,
       "searchSpan": 8,
       "index": 12,
-      "width": 130,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 13,
-      "width": 130,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8,
@@ -138,16 +138,16 @@
       "label": "制单人",
       "prop": "createUser",
       "index": 14,
-      "width": 130,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "name",
         "value": "id"
       },
-      "filterable":true,
+      "filterable": true,
       "searchSpan": 8
     }
   ]

src/views/exportTrade/receipt/detailsPage.vue

@@ -43,7 +43,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option"
+        >
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
@@ -69,6 +74,7 @@
           @row-del="rowDel"
           @saveColumn="saveColumn"
           :summary-method="summaryMethod"
+          :cell-style="cellStyle"
         >
           <template slot="menuLeft">
             <el-button
@@ -206,6 +212,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -463,7 +470,7 @@ export default {
       oldorderFeesList: [],
       oldorderFilesList: [],
       subLoading: false,
-       pageLoading: false,
+      pageLoading: false,
       showBut: true
     };
   },
@@ -478,6 +485,9 @@ export default {
     uploadFile
   },
   async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(7),
       tableOption
@@ -489,9 +499,6 @@ export default {
     if (this.$route.query.pageType == "Generate") {
       this.getGenerate(JSON.parse(this.$route.query.data));
     }
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
@@ -523,6 +530,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rePick(row, index) {
       this.reData = {
         ...row,
@@ -918,7 +928,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/receipt/index.vue

@@ -239,7 +239,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 440;
+            this.option.height = window.innerHeight - 400;
           }
         })
         .finally(() => {

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

@@ -77,30 +77,46 @@
       "overHidden": true
     },
     {
+      "label": "配件描述",
+      "prop": "partsDescribe",
+      "index": 9,
+      "width": 120,
+      "overHidden": true,
+      "cell": true
+    },
+    {
       "label": "配件价格",
       "prop": "partsPrice",
-      "index": 9,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "配件价格描述",
+      "prop": "partsPriceDescribe",
+      "index": 11,
+      "width": 120,
+      "overHidden": true,
+      "cell": true
+    },
+    {
       "label": "供应商",
       "prop": "corpId",
-      "index": 10,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "重点推荐",
       "prop": "priorityReferrer",
-      "index": 11,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "推荐理由",
       "prop": "referrerReason",
-      "index": 12,
+      "index": 14,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -108,14 +124,14 @@
     {
       "label": "销售价",
       "prop": "price",
-      "index": 13,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 14,
+      "index": 16,
       "width": 100,
       "overHidden": true,
       "cell": true,
@@ -129,56 +145,56 @@
     {
       "label": "数量",
       "prop": "orderQuantity",
-      "index": 15,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "发货数量",
       "prop": "actualQuantity",
-      "index": 16,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "保险",
       "prop": "insurance",
-      "index": 17,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "运费",
       "prop": "freight",
-      "index": 18,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "折扣",
       "prop": "discount",
-      "index": 19,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 20,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 21,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 22,
+      "index": 24,
       "width": 100,
       "overHidden": true,
       "cell": true

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 24,
   "border": true,
@@ -14,23 +13,25 @@
   "searchIndex": 2,
   "searchLabelWidth": 90,
   "showSummary": true,
+  "selection": true,
+  "tip": false,
   "column": [{
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 1,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "订单日期",
       "prop": "businesDate",
       "search": true,
       "index": 2,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
-      "searchSpan":8,
+      "searchSpan": 8,
       "type": "date",
       "format": "yyyy-MM-dd"
     },
@@ -38,19 +39,19 @@
       "label": "销售订单号",
       "prop": "orderNo",
       "index": 3,
-      "width": 100,
+      "minWidth": 100,
       "overHidden": true,
       "search": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "预交日期",
       "prop": "plannedDeliveryDate",
       "search": true,
       "index": 4,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
-      "searchSpan":8,
+      "searchSpan": 8,
       "type": "date",
       "format": "yyyy-MM-dd"
     },
@@ -58,63 +59,63 @@
       "label": "价格条款",
       "prop": "priceTerms",
       "index": 5,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "收款方式",
       "prop": "paymentType",
       "index": 5,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "运输方式",
       "prop": "transport",
       "index": 6,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "箱型",
       "prop": "boxPile",
       "index": 7,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "箱量",
       "prop": "boxNumber",
       "index": 8,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "起订量",
       "prop": "minOrder",
       "index": 8,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "预计海运费",
       "prop": "predictOceanFreight",
       "index": 8,
-      "width": 100,
+      "minWidth": 100,
       "overHidden": true
     },
     {
       "label": "参考海运费",
       "prop": "referenceOceanFreight",
       "index": 8,
-      "width": 100,
+      "minWidth": 100,
       "overHidden": true
     },
     {
       "label": "实际海运费",
       "prop": "oceanFreight",
       "index": 8,
-      "width": 100,
+      "minWidth": 100,
       "overHidden": true
     },
     {
@@ -122,30 +123,30 @@
       "prop": "orderStatus",
       "search": true,
       "index": 9,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "type": "select",
       "props": {
         "label": "dictValue",
         "value": "dictValue"
       },
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "起运港",
       "prop": "portOfLoad",
       "search": true,
       "index": 10,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "目的港",
       "prop": "portOfDestination",
       "search": true,
       "index": 11,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
       "type": "select",
       "filterable": true,
@@ -154,48 +155,48 @@
         "label": "name",
         "value": "name"
       },
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "数量合计",
       "prop": "orderQuantity",
       "index": 12,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "发货数量",
       "prop": "actualQuantity",
       "index": 12,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "毛利额",
       "prop": "grossProfit",
       "index": 13,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "毛利率",
       "prop": "grossProfitRate",
       "index": 14,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售金额",
       "prop": "amount",
       "index": 15,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "采购金额",
       "prop": "purchaseAmount",
       "index": 16,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -203,45 +204,45 @@
       "prop": "",
       "search": true,
       "index": 17,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
-      "hide":true,
-      "showColumn":false,
-      "searchSpan":8
+      "hide": true,
+      "showColumn": false,
+      "searchSpan": 8
     },
     {
       "label": "系统号",
       "prop": "sysNo",
       "search": true,
       "index": 17,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "制单人",
       "prop": "createUser",
       "index": 18,
-      "width": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "name",
         "value": "id"
       },
-      "filterable":true,
-      "searchSpan":8
+      "filterable": true,
+      "searchSpan": 8
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 19,
-      "width": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
-      "searchSpan":8,
+      "searchSpan": 8,
       "type": "date",
       "format": "yyyy-MM-dd"
     },
@@ -249,23 +250,23 @@
       "label": "备注",
       "prop": "orderRemark",
       "index": 20,
-      "width": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "采购备注",
       "prop": "purchaseRemark",
       "index": 21,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售备注",
       "prop": "shippingRemark",
       "index": 20,
-      "width": 100,
+      "minWidth": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/salesContract/detailsPage.vue

@@ -11,7 +11,9 @@
         </el-button>
       </div>
       <div class="add-customer-btn" v-if="showBut">
-        <el-button type="info" @click="saveSell" size="small">生成采购单</el-button>
+        <el-button type="info" @click="saveSell" size="small"
+          >生成采购单</el-button
+        >
         <el-button type="success" disabled size="small">
           复制新单
         </el-button>
@@ -29,7 +31,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form
+          ref="form"
+          class="trading-form"
+          v-model="form"
+          :option="option"
+        >
           <template slot="portOfLoad">
             <port-info
               v-model="form.portOfLoad"
@@ -121,6 +128,7 @@
             @selection-change="goodsSelectionChange"
             @saveColumn="saveColumn"
             :summary-method="summaryMethod"
+            :cell-style="cellStyle"
           >
             <template slot="cname" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" style="display:flex">
@@ -164,6 +172,7 @@
                 allow-create
                 default-first-option
                 placeholder="请输入"
+                size="small"
                 @focus="itemTypeFocus(row)"
               >
                 <el-option
@@ -329,19 +338,34 @@
       <div>
         <containerTitle title="银行信息"></containerTitle>
         <basic-container>
-          <avue-form ref="form" v-model="form" :option="bankOption" />
+          <avue-form
+            class="trading-form"
+            ref="form"
+            v-model="form"
+            :option="bankOption"
+          />
         </basic-container>
       </div>
       <div>
         <containerTitle title="保险信息"></containerTitle>
         <basic-container>
-          <avue-form ref="form" v-model="form" :option="insuranceOption" />
+          <avue-form
+            class="trading-form"
+            ref="form"
+            v-model="form"
+            :option="insuranceOption"
+          />
         </basic-container>
       </div>
       <div>
         <containerTitle title="唛头"></containerTitle>
         <basic-container>
-          <avue-form ref="form" v-model="form" :option="markOption" />
+          <avue-form
+            class="trading-form"
+            ref="form"
+            v-model="form"
+            :option="markOption"
+          />
         </basic-container>
       </div>
     </div>
@@ -380,6 +404,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -799,6 +824,9 @@ export default {
     partDialog
   },
   async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(5),
       tableOption
@@ -807,9 +835,6 @@ export default {
       this.getColumnName(28),
       goodsOption
     );
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
     if (this.detailData.status == 1) {
       this.option.disabled = true;
       this.bankOption.disabled = true;
@@ -852,6 +877,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     cnameChange(row) {
       this.goodsoptions.forEach(e => {
         if (e.cname == row.cname) {
@@ -1383,7 +1411,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/salesContract/index.vue

@@ -260,7 +260,7 @@ export default {
         this.dataList = res.data.data.records ? res.data.data.records : [];
         this.page.total = res.data.data.total;
         if (this.page.total) {
-          this.option.height = window.innerHeight - 440;
+          this.option.height = window.innerHeight - 400;
         }
       });
     },

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

@@ -1,5 +1,4 @@
 {
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 8,
   "border": true,
@@ -12,14 +11,15 @@
   "menuWidth": "80",
   "searchIcon": true,
   "searchIndex": 2,
-  "column": [
-    {
+  "selection": true,
+  "tip": false,
+  "column": [{
       "label": "询价日期",
       "prop": "businesDate",
       "search": true,
       "searchSpan": 8,
       "index": 2,
-      "minWidth": 100,
+      "minWidth": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -31,7 +31,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 3,
-      "minWidth": 100,
+      "minWidth": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -43,7 +43,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 5,
-      "minWidth": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -52,7 +52,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 6,
-      "minWidth": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
@@ -61,30 +61,30 @@
       "search": true,
       "searchSpan": 8,
       "index": 9,
-      "minWidth": 100,
+      "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "制单人",
       "prop": "createUser",
       "index": 10,
-      "minWidth": 100,
+      "minWidth": 80,
       "search": true,
       "searchSpan": 8,
       "type": "select",
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "name",
         "value": "id"
       },
-      "filterable":true,
+      "filterable": true,
       "overHidden": true
     },
     {
       "label": "制单日期",
       "prop": "createTime",
       "index": 11,
-      "minWidth": 100,
+      "minWidth": 80,
       "search": true,
       "overHidden": true,
       "searchSpan": 8,
@@ -97,7 +97,7 @@
       "search": true,
       "searchSpan": 8,
       "index": 14,
-      "minWidth": 100,
+      "minWidth": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -33,7 +33,12 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option" />
+        <avue-form
+          class="trading-form"
+          ref="form"
+          v-model="form"
+          :option="option"
+        />
       </basic-container>
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
@@ -44,6 +49,7 @@
           @row-del="rowDel"
           @saveColumn="saveColumn"
           :summary-method="summaryMethod"
+          :cell-style="cellStyle"
         >
           <!-- <template slot="menuLeft">
             <el-button
@@ -64,6 +70,7 @@
           :option="freightOption"
           @row-del="rowDel"
           @saveColumn="saveFreightColumn"
+          :cell-style="cellStyle"
         >
           <template slot="shippingHouse" slot-scope="{ row, index }">
             <customer-dialog
@@ -160,6 +167,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -332,7 +340,7 @@ export default {
       olddata: [],
       oldfreightData: [],
       subLoading: false,
-       pageLoading: false,
+      pageLoading: false,
       showBut: true
     };
   },
@@ -346,6 +354,9 @@ export default {
     customerDialog
   },
   async created() {
+    if (this.detailData.id) {
+      this.getDetail(this.detailData.id);
+    }
     this.tableOption = await this.getColumnData(
       this.getColumnName(13),
       tableOption
@@ -354,9 +365,6 @@ export default {
       this.getColumnName(32),
       goodsOption
     );
-    if (this.detailData.id) {
-      this.getDetail(this.detailData.id);
-    }
     let _this = this;
     this.tableOption.column.forEach(e => {
       if (e.prop == "taxRate") {
@@ -387,6 +395,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
         this.$set(row, "$cellEdit", false);
@@ -650,7 +661,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item {
+.trading-form ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {

src/views/exportTrade/shippingInquiry/index.vue

@@ -209,7 +209,7 @@ export default {
         this.dataList = res.data.data.records ? res.data.data.records : [];
         this.page.total = res.data.data.total;
         if (this.page.total) {
-          this.option.height = window.innerHeight - 340;
+          this.option.height = window.innerHeight - 300;
         }
       });
     },

src/views/maintenance/priceLibrary/detailsPage.vue

@@ -129,6 +129,20 @@ export default {
                 trigger: "blur"
               }
             ],
+            change: ({ value }) => {
+              if (value == "CNY") {
+                this.form.exchangeRate = 1;
+              }
+              if (value == "USD") {
+                this.form.exchangeRate = 6.3843;
+              }
+            },
+            span: 8
+          },
+          {
+            label: "汇率",
+            prop: "exchangeRate",
+            disabled:true,
             span: 8
           },
           {
@@ -174,6 +188,21 @@ export default {
             span: 8
           },
           {
+            label: "美元价格",
+            prop: "greenback",
+            span: 8
+          },
+          {
+            label: "税率",
+            prop: "taxRate",
+            span: 8
+          },
+          {
+            label: "商品类别",
+            prop: "goodsTypeName",
+            span: 8
+          },
+          {
             label: "状态",
             prop: "status",
             type: "select",
@@ -390,46 +419,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.sell-customer-btn {
-  position: fixed;
-  right: 244px;
-  top: 115px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }