瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy

lilei 4 年之前
父節點
當前提交
431693cf63
共有 3 個文件被更改,包括 16 次插入15 次删除
  1. 11 11
      src/api/supplier.js
  2. 2 2
      src/views/shop/goodsEdit.vue
  3. 3 2
      src/views/shop/goodsList.vue

+ 11 - 11
src/api/partner.js → src/api/supplier.js

@@ -1,8 +1,8 @@
 import { axios } from '@/utils/request'
 
 // 供应商列表
-export const partnerList = (params) => {
-  const url = `/partner/query/${params.pageNo}/${params.pageSize}`
+export const supplierList = (params) => {
+  const url = `/supplier/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios.request({
@@ -12,32 +12,32 @@ export const partnerList = (params) => {
   })
 }
 // 供应商列表 - 不分页
-export const partnerQueryList = (params) => {
+export const supplierQueryList = (params) => {
   return axios.request({
-    url: '/partner/queryList',
-    data: {},
+    url: '/supplier/queryList',
+    data: params,
     method: 'post'
   })
 }
 // 保存供应商
-export const partnerSave = (params) => {
+export const supplierSave = (params) => {
   return axios.request({
-    url: '/partner/save',
+    url: '/supplier/save',
     data: params,
     method: 'post'
   })
 }
 // 供应商详情
-export const partnerFind = (params) => {
+export const supplierFind = (params) => {
   return axios.request({
-    url: `/partner/findById/${params.id}`,
+    url: `/supplier/findById/${params.id}`,
     method: 'get'
   })
 }
 // 供应商启禁用
-export const partnerEnable = (params) => {
+export const supplierEnable = (params) => {
   return axios.request({
-    url: `/partner/enable/${params.id}/${params.flag}`,
+    url: `/supplier/enable/${params.id}/${params.flag}`,
     method: 'get'
   })
 }

+ 2 - 2
src/views/shop/goodsEdit.vue

@@ -107,7 +107,7 @@
 import { Upload, STable, VSelect } from '@/components'
 import Editor from '@/components/WEeditor'
 import { goodsTypeQueryList } from '@/api/goodsType'
-import { partnerQueryList } from '@/api/partner'
+import { supplierQueryList } from '@/api/supplier'
 import { goodsSave, goodsFind } from '@/api/goods'
 export default {
   name: 'GoodsEdit',
@@ -162,7 +162,7 @@ export default {
     },
     //  供应商下拉数据
     getPartnerQueryList () {
-      partnerQueryList().then(res => {
+      supplierQueryList({ state: 1 }).then(res => {
         if (res.status == 200) {
           this.partnerList = res.data
         } else {

+ 3 - 2
src/views/shop/goodsList.vue

@@ -70,7 +70,7 @@
 import { STable, VSelect } from '@/components'
 import { goodsList, goodsDel, goodsState } from '@/api/goods'
 import { goodsTypeQueryList } from '@/api/goodsType'
-import { partnerQueryList } from '@/api/partner'
+import { supplierQueryList } from '@/api/supplier'
 export default {
   name: 'GoodsList',
   components: { STable, VSelect },
@@ -91,6 +91,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '商品名称', dataIndex: 'name', width: 200, align: 'center' },
+        { title: '商品分类', dataIndex: 'goodsTypeName', width: 200, align: 'center' },
         { title: '商品价格(乐豆)', dataIndex: 'originalGold', width: 150, align: 'center' },
         { title: '供货商', dataIndex: 'officialPartnerName', width: 100, align: 'center' },
         { title: '商品状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
@@ -129,7 +130,7 @@ export default {
     },
     //  供应商下拉数据
     getPartnerQueryList () {
-      partnerQueryList().then(res => {
+      supplierQueryList({ state: 1 }).then(res => {
         if (res.status == 200) {
           this.partnerList = res.data
         } else {