制单人

src/api/basicData/customerInquiry.js

@@ -112,3 +112,11 @@ export function saveSell(data) {
     }
   })
 }
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
+}

src/api/basicData/invoice.js

@@ -94,4 +94,12 @@ export function getSpecification(query) {
     method: 'post',
     data: data
   })
+}
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
 }

src/api/basicData/purchaseInquiry.js

@@ -88,4 +88,12 @@ export function getSpecification(query) {
     method: 'get',
     params: query
   })
+}
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
 }

src/api/basicData/receipt.js

@@ -136,3 +136,11 @@ export function revokeInGoods(data) {
     data: data
   })
 }
+//生成销售单
+export function gainUser(query) {
+    return request({
+      url: '/api/blade-user/client/gainUser',
+      method: 'get',
+      params: query
+    })
+  }

src/api/basicData/salesContract.js

@@ -109,3 +109,11 @@ export function saveSell(data) {
     }
   })
 }
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
+}

src/api/basicData/shippingInquiry.js

@@ -99,4 +99,12 @@ export function delItem(data) {
       id: data
     }
   })
+}
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
 }

src/api/exportTrade/purchaseContract.js

@@ -108,3 +108,11 @@ export function getCKMarketDetailsList(current,size,params) {
     }
   })
 }
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
+}

src/api/exportTrade/receipt.js

@@ -94,4 +94,12 @@ export function getSpecification(query) {
     method: 'post',
     data: data
   })
+}
+//生成销售单
+export function gainUser(query) {
+  return request({
+    url: '/api/blade-user/client/gainUser',
+    method: 'get',
+    params: query
+  })
 }

src/util/columnSetting.js

@@ -12,7 +12,8 @@ export async function getColumnData(columnKey, mainOption) {
     let res = await getColumn({
       fileName: columnKey
     })
-    option = res.data.data ? JSON.parse(res.data.data.jsonMessage) : mainOption;
+    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));
   }
   return option

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

@@ -104,7 +104,7 @@
       "overHidden": true,
       "cell": true,
       "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
+      "dicData":[],
       "props": {
         "label": "dictValue",
         "value": "dictValue"

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

@@ -19,7 +19,7 @@
       "index": 1,
       "width": 100,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "订单日期",
@@ -28,7 +28,7 @@
       "index": 2,
       "width": 100,
       "overHidden": true,
-      "searchSpan":8,
+      "searchSpan": 8,
       "type": "date",
       "format": "yyyy-MM-dd"
     },
@@ -39,7 +39,7 @@
       "index": 3,
       "width": 100,
       "overHidden": true,
-      "searchSpan":8,
+      "searchSpan": 8,
       "type": "date",
       "format": "yyyy-MM-dd"
     },
@@ -90,7 +90,7 @@
         "label": "dictValue",
         "value": "dictValue"
       },
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "起运港",
@@ -99,7 +99,7 @@
       "index": 10,
       "width": 100,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "目的港",
@@ -115,7 +115,7 @@
         "label": "name",
         "value": "name"
       },
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "数量合计",
@@ -159,9 +159,9 @@
       "index": 17,
       "width": 100,
       "overHidden": true,
-      "hide":true,
-      "showColumn":false,
-      "searchSpan":8
+      "hide": true,
+      "showColumn": false,
+      "searchSpan": 8
     },
     {
       "label": "系统号",
@@ -170,7 +170,7 @@
       "index": 17,
       "width": 100,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "制单人",
@@ -179,7 +179,14 @@
       "width": 100,
       "search": true,
       "overHidden": true,
-      "searchSpan":8
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
+      "searchSpan": 8
     },
     {
       "label": "制单日期",
@@ -188,7 +195,7 @@
       "width": 100,
       "search": true,
       "overHidden": true,
-      "searchSpan":8,
+      "searchSpan": 8,
       "type": "date",
       "format": "yyyy-MM-dd"
     },
@@ -199,7 +206,7 @@
       "width": 100,
       "search": true,
       "overHidden": true,
-      "searchSpan":8
+      "searchSpan": 8
     },
     {
       "label": "采购备注",

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -703,6 +703,10 @@ export default {
       this.findObject(this.tableOption.column, "itemProp").dicData =
         res.data.data;
     });
+    this.getWorkDicts("unit").then(res => {
+      this.findObject(this.tableOption.column, "unit").dicData =
+        res.data.data;
+    });
     getPorts().then(res => {
       this.findObject(this.option.column, "portOfLoad").dicData = res.data;
       this.findObject(this.option.column, "portOfDestination").dicData =

src/views/exportTrade/customerInquiry/index.vue

@@ -117,7 +117,7 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, remove } from "@/api/basicData/customerInquiry";
+import { getList, remove,gainUser } from "@/api/basicData/customerInquiry";
 import detailPage from "./detailsPage.vue";
 import { defaultDate } from "@/util/date";
 import { micrometerFormat } from "@/util/validate";
@@ -182,6 +182,9 @@ export default {
         };
       }
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   methods: {
     cellStyle() {

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

@@ -139,6 +139,13 @@
       "width": 110,
       "search": true,
       "overHidden": true,
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
       "searchSpan": 8
     }
   ]

src/views/exportTrade/invoice/index.vue

@@ -108,7 +108,7 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, remove } from "@/api/basicData/invoice";
+import { getList, remove, gainUser } from "@/api/basicData/invoice";
 import detailPage from "./detailsPage.vue";
 import { micrometerFormat } from "@/util/validate";
 import { defaultDate } from "@/util/date";
@@ -173,6 +173,9 @@ export default {
         };
       }
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   activated() {
     //当页面已打开并无法重新渲染时，用activated重新激活keepalive组件

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

@@ -120,6 +120,13 @@
       "width": 100,
       "search": true,
       "overHidden": true,
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
       "searchSpan": 8
     },
     {

src/views/exportTrade/purchaseContract/index.vue

@@ -119,7 +119,7 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, remove } from "@/api/exportTrade/purchaseContract";
+import { getList, remove, gainUser } from "@/api/exportTrade/purchaseContract";
 import detailPage from "./detailsPage.vue";
 import { defaultDate } from "@/util/date";
 export default {
@@ -176,6 +176,9 @@ export default {
       this.findObject(this.option.column, "paymentType").dicData =
         res.data.data;
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   methods: {
     cellStyle() {

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

@@ -107,6 +107,13 @@
       "width": 110,
       "search": true,
       "searchSpan": 8,
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
       "overHidden": true
     },
     {

src/views/exportTrade/purchaseInquiry/index.vue

@@ -100,7 +100,12 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, remove, getPorts } from "@/api/basicData/purchaseInquiry";
+import {
+  getList,
+  remove,
+  getPorts,
+  gainUser
+} from "@/api/basicData/purchaseInquiry";
 import detailPage from "./detailsPage.vue";
 import { defaultDate } from "@/util/date";
 import { micrometerFormat } from "@/util/validate";
@@ -159,6 +164,9 @@ export default {
       this.findObject(this.option.column, "portOfDestination").dicData =
         res.data;
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   methods: {
     cellStyle() {

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

@@ -140,6 +140,13 @@
       "width": 130,
       "search": true,
       "overHidden": true,
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
       "searchSpan": 8
     }
   ]

src/views/exportTrade/receipt/index.vue

@@ -99,7 +99,7 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, remove } from "@/api/exportTrade/receipt";
+import { getList, remove,gainUser } from "@/api/exportTrade/receipt";
 import detailPage from "./detailsPage.vue";
 import { micrometerFormat } from "@/util/validate";
 import { defaultDate } from "@/util/date";
@@ -157,6 +157,9 @@ export default {
         };
       }
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   activated() {
     //当页面已打开并无法重新渲染时，用activated重新激活keepalive组件

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

@@ -224,6 +224,13 @@
       "width": 100,
       "search": true,
       "overHidden": true,
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
       "searchSpan":8
     },
     {

src/views/exportTrade/salesContract/index.vue

@@ -116,7 +116,12 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, remove, getPorts } from "@/api/basicData/salesContract";
+import {
+  getList,
+  remove,
+  getPorts,
+  gainUser
+} from "@/api/basicData/salesContract";
 import detailPage from "./detailsPage.vue";
 import { defaultDate } from "@/util/date";
 import { micrometerFormat } from "@/util/validate";
@@ -180,6 +185,9 @@ export default {
       this.findObject(this.option.column, "orderStatus").dicData =
         res.data.data;
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   methods: {
     cellStyle() {
@@ -285,10 +293,10 @@ export default {
             item.property == "predictOceanFreight" ||
             item.property == "referenceOceanFreight" ||
             item.property == "oceanFreight" ||
-            item.property == "orderQuantity"||
-            item.property == "actualQuantity"||
-            item.property == "grossProfit"||
-            item.property == "amount"||
+            item.property == "orderQuantity" ||
+            item.property == "actualQuantity" ||
+            item.property == "grossProfit" ||
+            item.property == "amount" ||
             item.property == "purchaseAmount"
           ) {
             let qtySum = 0;

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

@@ -70,6 +70,13 @@
       "width": 180,
       "search": true,
       "searchSpan": 8,
+      "type": "select",
+      "dicData":[],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "filterable":true,
       "overHidden": true
     },
     {

src/views/exportTrade/shippingInquiry/index.vue

@@ -97,7 +97,7 @@
 
 <script>
 import option from "./config/mainList.json";
-import { getList, getPorts } from "@/api/basicData/shippingInquiry";
+import { getList, getPorts, gainUser } from "@/api/basicData/shippingInquiry";
 import detailPage from "./detailsPage.vue";
 
 export default {
@@ -152,6 +152,9 @@ export default {
       this.findObject(this.option.column, "portOfDestination").dicData =
         res.data;
     });
+    gainUser().then(res => {
+      this.findObject(this.option.column, "createUser").dicData = res.data.data;
+    });
   },
   methods: {
     cellStyle() {