qinbai 3 vuotta sitten
vanhempi
commit
34231ad06f

+ 8 - 0
src/api/basicData/commodityCategory.js

@@ -33,3 +33,11 @@ export function deleteDetails(data) {
         }
     })
 }
+//客户类别列表查询
+export function getTreeList(data) {
+  return request({
+    url: '/api/blade-client/goodstype/tree',
+    method: 'get',
+    params: data
+  })
+}

+ 2 - 2
src/views/basicData/commodityCategory/configuration/mainList.json

@@ -54,8 +54,8 @@
       "hide": true,
       "addDisabled": false,
       "props": {
-        "label": "cname",
-        "value": "id"
+        "label": "title",
+        "value": "value"
       },
       "rules": [{
         "required": false,

+ 3 - 3
src/views/basicData/commodityCategory/index.vue

@@ -33,7 +33,7 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave,detail,deleteDetails} from "@/api/basicData/commodityCategory"
+import {customerList, typeSave,detail,deleteDetails,getTreeList} from "@/api/basicData/commodityCategory"
 
 export default {
   name: "customerInformation",
@@ -52,9 +52,9 @@ export default {
     }
   },
   created() {
-    customerList({parentId:0}).then(res => {
+    getTreeList({parentId:0}).then(res => {
       const column = this.findObject(this.option.column, "parentId");
-      column.dicData = res.data.data.records;
+      column.dicData = res.data.data;
     });
   },
   methods: {

+ 11 - 0
src/views/importTrade/receipt/config/mainList.json

@@ -44,6 +44,17 @@
       "index": 4,
       "width":120
     },{
+      "label": "销售公司",
+      "prop": "salesCompanyName",
+      "search": true,
+      "index": 5,
+      "width":150
+    },{
+      "label": "工厂/贸易商名称",
+      "prop": "corpName",
+      "index": 6,
+      "width":150
+    },{
       "label": "仓库名称",
       "prop": "storageId",
       "search": true,

+ 13 - 1
src/views/salesManagement/salesContract/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 18,
   "searchMenuPosition": "right",
   "dialogWidth": "60%",
   "tree": true,
@@ -40,6 +40,18 @@
       "index": 2,
       "width":150
     },{
+      "label": "销售公司",
+      "prop": "belongToCorpName",
+      "search": true,
+      "index": 3,
+      "width":120
+    },{
+      "label": "工厂/贸易商名称",
+      "prop": "corpsName",
+      "search": true,
+      "index": 4,
+      "width":150
+    },{
       "label": "合同金额",
       "prop": "orderAmount",
       "search": false,