Browse Source

修改bug

QuKatie 3 years ago
parent
commit
cccdc0e04d

+ 34 - 25
src/views/exportTrade/customerInquiry/config/mainList.json

@@ -1,6 +1,6 @@
 {
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 24,
   "border": true,
   "index": true,
   "viewBtn": false,
@@ -13,7 +13,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "selection": true,
-  "tip":false,
+  "tip": false,
   "expand": true,
   "expandWidth": 38,
   "column": [{
@@ -37,10 +37,19 @@
       "format": "yyyy-MM-dd"
     },
     {
+      "label": "订单号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 3,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },
+    {
       "label": "有效日期",
       "prop": "dateValidity",
       "search": true,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -50,35 +59,35 @@
     {
       "label": "价格条款",
       "prop": "priceTerms",
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "收款方式",
       "prop": "paymentType",
-      "index": 5,
+      "index": 6,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "运输方式",
       "prop": "transport",
-      "index": 6,
+      "index": 7,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "箱型",
       "prop": "boxPile",
-      "index": 7,
+      "index": 8,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "箱量",
       "prop": "boxNumber",
-      "index": 8,
+      "index": 9,
       "minWidth": 80,
       "overHidden": true
     },
@@ -86,7 +95,7 @@
       "label": "订单状态",
       "prop": "orderStatus",
       "search": true,
-      "index": 9,
+      "index": 10,
       "minWidth": 80,
       "overHidden": true,
       "type": "select",
@@ -100,7 +109,7 @@
       "label": "起运港",
       "prop": "portOfLoad",
       "search": true,
-      "index": 10,
+      "index": 11,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -109,7 +118,7 @@
       "label": "目的港",
       "prop": "portOfDestination",
       "search": true,
-      "index": 11,
+      "index": 12,
       "minWidth": 80,
       "overHidden": true,
       "type": "select",
@@ -124,35 +133,35 @@
     {
       "label": "数量合计",
       "prop": "orderQuantity",
-      "index": 12,
+      "index": 13,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "产品毛利",
       "prop": "grossProfit",
-      "index": 13,
+      "index": 14,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "产品利率",
       "prop": "grossProfitRate",
-      "index": 14,
+      "index": 15,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售金额",
       "prop": "amount",
-      "index": 15,
+      "index": 16,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "采购金额",
       "prop": "purchaseAmount",
-      "index": 16,
+      "index": 17,
       "minWidth": 80,
       "overHidden": true
     },
@@ -160,7 +169,7 @@
       "label": "商品名称",
       "prop": "",
       "search": true,
-      "index": 17,
+      "index": 18,
       "minWidth": 80,
       "overHidden": true,
       "hide": true,
@@ -171,7 +180,7 @@
       "label": "系统号",
       "prop": "sysNo",
       "search": true,
-      "index": 17,
+      "index": 19,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -179,23 +188,23 @@
     {
       "label": "制单人",
       "prop": "createUser",
-      "index": 18,
+      "index": 20,
       "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": 19,
+      "index": 21,
       "minWidth": 80,
       "search": true,
       "overHidden": true,
@@ -206,7 +215,7 @@
     {
       "label": "备注",
       "prop": "orderRemark",
-      "index": 20,
+      "index": 22,
       "minWidth": 80,
       "search": true,
       "overHidden": true,
@@ -215,14 +224,14 @@
     {
       "label": "采购备注",
       "prop": "purchaseRemark",
-      "index": 21,
+      "index": 23,
       "minWidth": 80,
       "overHidden": true
     },
     {
       "label": "销售备注",
       "prop": "shippingRemark",
-      "index": 20,
+      "index": 24,
       "minWidth": 80,
       "overHidden": true
     }

+ 10 - 1
src/views/exportTrade/customerInquiry/index.vue

@@ -92,10 +92,19 @@
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, 1)"
+          <span
+            style="color: #409EFF;cursor: pointer"
+            @click.stop="beforeOpenPage(scope.row, 1)"
             >{{ scope.row.corpsName }}
           </span>
         </template>
+        <template slot-scope="scope" slot="orderNo">
+          <span
+            style="color: #409EFF;cursor: pointer"
+            @click.stop="beforeOpenPage(scope.row, 1)"
+            >{{ scope.row.orderNo}}
+          </span>
+        </template>
         <template slot-scope="scope" slot="grossProfitRate">
           {{ scope.row.grossProfitRate ? scope.row.grossProfitRate : 0 }}%
         </template>