修改商品列表

src/api/mallManagement/commodity/productList.js

@@ -1,6 +1,6 @@
 import request from '@/router/axios';
 
-export const getList = (current, size, params, goodsTypeId) => {
+export const getList = (current, size, params, typeId) => {
     return request({
         url: '/api/store-goods/goodsdesc/list',
         method: 'get',
@@ -8,7 +8,7 @@ export const getList = (current, size, params, goodsTypeId) => {
             ...params,
             current,
             size,
-            goodsTypeId,
+            typeId,
         }
     })
 }
@@ -121,7 +121,7 @@ export const grant = (userIds, roleIds) => {
 
 export const getDeptLazyTree = (parentId) => {
     return request({
-        url: '/api/store-goods/goodstype/page',
+        url: '/api/store-goods/goodstype/lazy-tree',
         method: 'get',
         params: {
             parentId
@@ -175,3 +175,12 @@ export const underCommodity = (data) => {
         params: data
     })
 }
+
+//商品分类下拉选择
+export const classificationSelection = (data) => {
+    return request({
+        url: '/api/store-goods/goodstype/tree',
+        method: 'get',
+        params: data
+    })
+}

src/api/mallOrder/index.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+//订单列表查询
+export function getList(data,params){
+    return request({
+        url: '/api/store-goods/order/list',
+        method: 'get',
+        params: {
+            ...data,
+            ...params
+        }
+    })
+}

src/views/mallManagement/commodity/productList/configuration/specification.json

@@ -20,7 +20,12 @@
       "prop": "goodsName",
       "minWidth": 100,
       "disabled":true,
-      "span": 24
+      "span": 24,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
     },{
       "label": "商品编码",
       "prop": "goodsCode",
@@ -138,7 +143,12 @@
       },
       "minRows": 0,
       "row":true,
-      "controls":false
+      "controls":false,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
     },
     {
       "label": "市场价",
@@ -154,7 +164,12 @@
       },
       "minRows": 0,
       "row":true,
-      "controls":false
+      "controls":false,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
     },
     {
       "label": "vip",

src/views/mallManagement/commodity/productList/detailsPageEdit.vue

@@ -174,7 +174,7 @@
   </div>
 </template>
 <script>
-import {getDetail, updateDetail, getDeptTree, priceDelete} from "@/api/mallManagement/commodity/productList";
+import {getDetail, updateDetail, getDeptTree, priceDelete,classificationSelection} from "@/api/mallManagement/commodity/productList";
 import sftOption from "./configuration/specification.json";
 import imgUploadList from "./configuration/imgUploadList.json";
 import productParameters from "./configuration/productParameters.json";
@@ -245,18 +245,22 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
-        column: [
-          {
+        column: [{
             label: "分类",
             prop: "typeId",
+            dicData: [],
+            type: "tree",
             span: 8,
-            rules: [
-              {
-                required: true,
-                message: " ",
-                trigger: "blur"
-              }
-            ]
+            hide: true,
+            addDisabled: false,
+            props: {
+              label: "title"
+            },
+            rules: [{
+              required: false,
+              message: "请选择上级机构",
+              trigger: "click"
+            }]
           },
           {
             label: "排序",
@@ -271,8 +275,8 @@ export default {
             ]
           },
           {
-            label: "商品名称",
-            prop: "cname",
+            label: "推广词",
+            prop: "promote",
             span: 8,
             rules: [
               {
@@ -283,8 +287,8 @@ export default {
             ]
           },
           {
-            label: "推广词",
-            prop: "promote",
+            label: "商品名称",
+            prop: "cname",
             span: 24,
             rules: [
               {
@@ -303,6 +307,11 @@ export default {
     getDeptTree().then(res => {
       this.dicData = res.data.data;
     });
+    classificationSelection().then(res=>{
+      console.log(res.data.data)
+      const column = this.findObject(this.option.column, "typeId");
+      column.dicData = res.data.data;
+    })
     if (this.$route.query.id) {
       this.query(JSON.parse(this.$route.query.id))
     } else {

src/views/mallManagement/commodity/productList/index.vue

@@ -129,11 +129,10 @@ export default {
         treeLoad: function (node, resolve) {
           const parentId = (node.level === 0) ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
-            console.log(res.data.data.records)
-            resolve(res.data.data.records.map(item => {
+            resolve(res.data.data.map(item => {
               return {
                 ...item,
-                leaf: !item.cname
+                leaf: !item.hasChildren
               }
             }))
           });
@@ -143,8 +142,8 @@ export default {
         size: 'small',
         props: {
           labelText: '标题',
-          label: 'cname',
-          value: 'id',
+          label: 'title',
+          value: 'value',
           children: 'children'
         }
       },
@@ -267,6 +266,7 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
+      console.log('1111')
       this.query = params;
       this.page.currentPage = 1;
       this.onLoad(this.page, params);

src/views/orderManagement/orderList/config/mainList.json

@@ -21,40 +21,71 @@
     "overHidden": true
   },{
     "label": "下单人",
-    "prop": "createUser",
+    "prop": "userRealName",
     "search": true,
     "index": 2,
     "width": 100,
     "overHidden": true
   },{
     "label": "订单金额",
-    "prop": "createUser",
+    "prop": "actualPrice",
     "search": false,
     "index": 3,
     "width": 100,
     "overHidden": true
   },{
     "label": "实际付款",
-    "prop": "createUser",
+    "prop": "actualPrice",
     "search": false,
     "index": 4,
     "width": 100,
     "overHidden": true
   },{
     "label": "订单状态",
-    "prop": "createUser",
+    "prop": "orderStatus",
     "search": false,
+    "type": "checkbox",
+    "dicData": [
+      {
+        "label": "代付款",
+        "value": "0"
+      },
+      {
+        "label": "代发货",
+        "value": "1"
+      },
+      {
+        "label": "待收货",
+        "value": "2"
+      },
+      {
+        "label": "待评价",
+        "value": "3"
+      },
+      {
+        "label": "已完成",
+        "value": "4"
+      },
+      {
+        "label": "已取消",
+        "value": "5"
+      },
+      {
+        "label": "售后中",
+        "value": "6"
+      },
+      {
+        "label": "售后结束",
+        "value": "7"
+      }
+    ],
+    "mock":{
+      "type":"dic"
+    },
     "index": 5,
     "width": 100,
     "overHidden": true
   },{
-    "label": "订单类型",
-    "prop": "createUser",
-    "search": false,
-    "index": 6,
-    "width": 100,
-    "overHidden": true
-  },{
     "label": "下单人手机号",
     "prop": "createUser",
     "search": true,
@@ -63,7 +94,7 @@
     "overHidden": true
   },{
     "label": "下单时间",
-    "prop": "createUser",
+    "prop": "createTime",
     "search": true,
     "index": 8,
     "width": 100,
@@ -98,12 +129,5 @@
     "index": 12,
     "width": 100,
     "overHidden": true
-  },{
-    "label": "分销",
-    "prop": "createUser",
-    "search": false,
-    "index": 13,
-    "width": 100,
-    "overHidden": true
   }]
 }

src/views/orderManagement/orderList/index.vue

@@ -2,21 +2,23 @@
   <div>
     <div v-if="show">
       <!--    选择-->
-      <div class="tags">
-        <ul>
-          <li @click="changeTags('待付款')"><span :class="{'active': tagsName == '待付款'}">待付款<div v-if="tagsName == '待付款'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('待发货')"><span :class="{'active': tagsName == '待发货'}">待发货<div v-if="tagsName == '待发货'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('待收货')"><span :class="{'active': tagsName == '待收货'}">待收货<div v-if="tagsName == '待收货'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('待评价')"><span :class="{'active': tagsName == '待评价'}">待评价<div v-if="tagsName == '待评价'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('已完成')"><span :class="{'active': tagsName == '已完成'}">已完成<div v-if="tagsName == '已完成'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('已取消')"><span :class="{'active': tagsName == '已取消'}">已取消<div v-if="tagsName == '已取消'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('售后中')"><span :class="{'active': tagsName == '售后中'}">售后中<div v-if="tagsName == '售后中'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li @click="changeTags('售后结束')"><span :class="{'active': tagsName == '售后结束'}">售后结束<div v-if="tagsName == '售后结束'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
-          <li style="position: absolute;right: 20px" @click="changeTags('全部')"><span :class="{'active': tagsName == '全部'}">全部<div v-if="tagsName == '全部'" class="active_bot el-button--primary"></div></span> <span class="orderNum" style="background: #000;color: #fff">0</span></li>
-        </ul>
-      </div>
+      <basic-container>
+        <div class="tags">
+          <ul>
+            <li @click="changeTags('待付款')"><span :class="{'active': tagsName == '待付款'}">待付款<div v-if="tagsName == '待付款'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('待发货')"><span :class="{'active': tagsName == '待发货'}">待发货<div v-if="tagsName == '待发货'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('待收货')"><span :class="{'active': tagsName == '待收货'}">待收货<div v-if="tagsName == '待收货'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('待评价')"><span :class="{'active': tagsName == '待评价'}">待评价<div v-if="tagsName == '待评价'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('已完成')"><span :class="{'active': tagsName == '已完成'}">已完成<div v-if="tagsName == '已完成'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('已取消')"><span :class="{'active': tagsName == '已取消'}">已取消<div v-if="tagsName == '已取消'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('售后中')"><span :class="{'active': tagsName == '售后中'}">售后中<div v-if="tagsName == '售后中'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li @click="changeTags('售后结束')"><span :class="{'active': tagsName == '售后结束'}">售后结束<div v-if="tagsName == '售后结束'" class="active_bot el-button--primary"></div></span> <span class="orderNum el-button--primary">0</span></li>
+            <li style="position: absolute;right: 40px" @click="changeTags('全部')"><span :class="{'active': tagsName == '全部'}">全部<div v-if="tagsName == '全部'" class="active_bot el-button--primary"></div></span> <span class="orderNum" style="background: #000;color: #fff">0</span></li>
+          </ul>
+        </div>
+      </basic-container>
       <!--    分割线-->
-      <div style="width: 100%;margin: 20px auto;border-top: 1px solid #aaa8a8"></div>
+<!--      <div style="width: 100%;margin: 20px auto;border-top: 1px solid #aaa8a8"></div>-->
       <basic-container>
         <avue-crud
           :option="option"
@@ -24,6 +26,7 @@
           :data="dataList"
           :page.sync="page"
           :search.sync="search"
+          @search-change="searchChange"
           @on-load="onLoad"
         >
           <template slot-scope="scope" slot="menu">
@@ -35,6 +38,9 @@
             >查看
             </el-button>
           </template>
+<!--          <template slot="menuLeft" slot-scope="{size}">-->
+<!--            <el-button type="primary" :size="size" @click="exportExcel">自定义按钮</el-button>-->
+<!--          </template>-->
         </avue-crud>
       </basic-container>
     </div>
@@ -43,7 +49,7 @@
 
 <script>
 import option from "./config/mainList.json"
-
+import {getList} from '@/api/mallOrder/index.js'
 export default {
   name: "orderList",
   data() {
@@ -74,12 +80,33 @@ export default {
     }
   },
   methods: {
+    //导出
+    exportExcel() {
+      console.log(this.$export)
+      // this.$export.excel({
+      //   title: "商户pos机",
+      //   columns: [
+      //     { label: "金额", prop: "actualPrice" }
+      //   ],
+      //   data: this.dataList
+      // });
+    },
     // 选择卡切换
     changeTags(name) {
       if (this.tagsName == name) return
       this.tagsName = name
     },
-    onLoad(page, params) {
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    onLoad(page,  params = {}) {
+      getList(page, params).then(res=>{
+        console.log(res.data)
+        this.dataList = res.data.data.records
+      })
     },
     handleView(row) {
       this.$router.push({

vue.config.js

@@ -27,10 +27,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.1.177:1080',
-        // target: 'http://192.168.1.151:1080',
+        target: 'http://192.168.1.151:1080',
         // 打包地址.
         // target: 'http://121.37.83.47:10004',//服务器ip
-        target: 'http://trade.tubaosoft.com:10004',//服务器域名
+        // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
           '^/api': '/'