Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

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
+  })
+}

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,

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: {

src/views/basicData/commodityType/index.vue

@@ -148,7 +148,7 @@
               </el-button>
             </template>
           </avue-form>
-          <p style="text-align: center;color: rgba(165,164,164,0.64)">温馨提示 请先下载模板再上传附件</p>
+          <p style="text-align: center;color: #DC0505">温馨提示  第一次导入时请先下载模板</p>
         </el-dialog>
       </basic-container>
     </el-col>

src/views/basicData/customerInformation/index.vue

@@ -92,7 +92,7 @@
               </el-button>
             </template>
           </avue-form>
-          <p style="text-align: center;color: rgba(165,164,164,0.64)">温馨提示 请先下载模板再上传附件</p>
+          <p style="text-align: center;color: #DC0505">温馨提示  第一次导入时请先下载模板</p>
         </el-dialog>
       </basic-container>
     </el-col>

src/views/basicData/productInformation/index.vue

@@ -69,7 +69,7 @@
               </el-button>
             </template>
           </avue-form>
-          <p style="text-align: center;color: rgba(165,164,164,0.64)">温馨提示 请先下载模板再上传附件</p>
+          <p style="text-align: center;color: #DC0505">温馨提示  第一次导入时请先下载模板</p>
         </el-dialog>
       </basic-container>
     </el-col>

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,

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,

src/views/wel/index.vue

@@ -2,16 +2,16 @@
   <basic-container>
     <div class="container" :style="isHeight">
       <div class="container-items">
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
-        <but-card iconName="el-icon-edit-outline" name="新建工单" />
+        <but-card iconName="el-icon-edit-outline" name="销售订单" />
+        <but-card iconName="el-icon-edit-outline" name="采购订单" />
+        <but-card iconName="el-icon-edit-outline" name="发货单" />
+        <but-card iconName="el-icon-edit-outline" name="收货单" />
+        <but-card iconName="el-icon-edit-outline" name="库存" />
+        <but-card iconName="el-icon-edit-outline" name="客户管理" />
+        <but-card iconName="el-icon-edit-outline" name="商品管理" />
+        <but-card iconName="el-icon-edit-outline" name="用户管理" />
+        <but-card iconName="el-icon-edit-outline" name="收费管理" />
+        <but-card iconName="el-icon-edit-outline" name="付费管理" />
       </div>
       <index-card title="今日工作看板" iconName="el-icon-view">
         <div slot="content" style="height:25vh"></div>