diff --git a/.env.development b/.env.development index 7029818..ad2c296 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ ENV = 'development' # VUE_APP_BASE_API = 'http://192.168.2.17:8000' # VUE_APP_BASE_API = 'http://192.168.2.42:8000' # VUE_APP_BASE_API = 'http://192.168.2.133:8000' -# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' -VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' +VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' +# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' # VUE_APP_BASE_API = 'http://192.168.2.96:8000' VUE_APP_WS_API = 'ws://192.168.2.128:8000' diff --git a/.env.production b/.env.production index ffc2fc2..3b02e74 100644 --- a/.env.production +++ b/.env.production @@ -2,8 +2,8 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' -# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' +# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' +VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' # VUE_APP_BASE_API = 'http://192.168.2.98:8000' # 如果接口是 http 形式， wss 需要改为 ws VUE_APP_WS_API = 'wss://123.56.110.252 diff --git a/dist.zip b/dist.zip deleted file mode 100644 index b2d45d3..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/package.json b/package.json index a5eb161..0ca61b6 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "babel-jest": "23.6.0", "babel-plugin-dynamic-import-node": "2.3.0", "babel-plugin-transform-remove-console": "^6.9.4", + "cache-loader": "^4.1.0", "chalk": "2.4.2", "chokidar": "2.1.5", "compression-webpack-plugin": "5.0.2", diff --git a/src/api/consumable.js b/src/api/consumable.js new file mode 100644 index 0000000..4f84398 --- /dev/null +++ b/src/api/consumable.js @@ -0,0 +1,136 @@ +import request from "@/utils/request"; + +/** + * 查询耗材类型 + * @returns + */ +export function gettbConsType(params) { + return request({ + url: '/api/tbConsType', + method: "get", + params + }); +} + +/** + * 新增耗材类型 + * @returns + */ +export function posttbConsType(data) { + return request({ + url: '/api/tbConsType', + method: "post", + data + }); +} +/** + * 修改耗材类型 + * @returns + */ +export function puttbConsType(data) { + return request({ + url: '/api/tbConsType', + method: "put", + data + }); +} +/** + * 查询耗材信息 + * @returns + */ +export function gettbConsInfo(params) { + return request({ + url: '/api/tbConsInfo', + method: "get", + params + }); +} +/** + * 耗材入库 + * @returns + */ +export function posttbConsInfostockIn(data) { + return request({ + url: '/api/tbConsInfo/stockIn', + method: "post", + data + }); +} +/** + * 新增耗材信息 + * @returns + */ +export function posttbConsInfo(data) { + return request({ + url: '/api/tbConsInfo', + method: "post", + data + }); +} + +/** + * 查询查询耗材规格信息 + * @returns + */ +export function getviewConSku(params) { + return request({ + url: '/api/viewConSku', + method: "get", + params + }); +} +/** + * 查询查询商品规格 + * @returns + */ +export function gettbProductSpec(params) { + return request({ + url: '/api/viewProductSkuShop', + method: "get", + params + }); +} +/** + * 新增商品规格耗材信息 + * @returns + */ +export function posttbProskuCon(data) { + return request({ + url: '/api/tbProskuCon', + method: "post", + data + }); +} +/** + * 修改商品规格耗材信息状态 + * @returns + */ +export function puttbProskuCon(data) { + return request({ + url: '/api/tbProskuCon', + method: "put", + data + }); +} +/** + * 删除商品规格耗材信息状态 + * @returns + */ +export function deletetbProskuCon(data) { + return request({ + url: '/api/tbProskuCon', + method: "delete", + data + }); +} +/** + * 查询耗材流水信息 + * @returns + */ +export function gettbConsInfoFlow(params) { + return request({ + url: '/api/tbConsInfoFlow', + method: "get", + params + }); +} \ No newline at end of file diff --git a/src/api/invoicing.js b/src/api/invoicing.js index b381534..58b107b 100644 --- a/src/api/invoicing.js +++ b/src/api/invoicing.js @@ -59,7 +59,14 @@ export function tbShopPurveyorGet(params) { params }); } - +// 供应商列表1 +export function tbShopPurveyorGets(params) { + return request({ + url: `/api/tbShopPurveyorTransact`, + method: "get", + params + }); +} /** * 增加供应商 * @returns @@ -95,7 +102,14 @@ export function tbShopPurveyorTransactInfo(data) { data }); } - +// 付款 +export function paidAmount(data) { + return request({ + url: `/api/tbShopPurveyorTransact/payTransact`, + method: "post", + data + }); +} /** * 进货账目汇总（单一供应商） * @returns @@ -149,19 +163,26 @@ export function tbProductStockOperateOutAndOn(data) { */ export function stock(params) { return request({ - url: `/api/stock`, + url: `/api/stock/v2`, + method: "get", + params + }); +} +// 库存列表子集列表 +export function stocks(params) { + return request({ + url: `/api/stock/sku`, method: "get", params }); } - /** * 导出数据 * @returns */ export function stockdownload(data) { return request({ - url: "/api/stock/download", + url: "/api/stock/download/v2", method: "post", data: { shopId: localStorage.getItem("shopId"), @@ -180,7 +201,7 @@ export function stockdoImport(file) { formData.append("file", file); formData.append("shopId", localStorage.getItem("shopId")); return request({ - url: "/api/stock/doImport", + url: "/api/stock/doImport/v2", method: "post", data: formData, Headers: { @@ -203,3 +224,14 @@ export function stockStateChange(params) { } }); } +// 共享库存 +export function stockStateChanges(params) { + return request({ + url: `/api/stock/productStatus`, + method: "put", + data: { + shopId: localStorage.getItem("shopId"), + ...params + } + }); +} \ No newline at end of file diff --git a/src/api/shop.js b/src/api/shop.js index 5891ae2..a5e27ff 100644 --- a/src/api/shop.js +++ b/src/api/shop.js @@ -6,7 +6,7 @@ import request from "@/utils/request"; */ export function tbProduct(params) { return request({ - url: "/api/tbProduct", + url: "/api/tbProduct/list", method: "get", params }); diff --git a/src/components/shopList/index.vue b/src/components/shopList/index.vue index 232270e..e24f0ad 100644 --- a/src/components/shopList/index.vue +++ b/src/components/shopList/index.vue @@ -30,6 +30,19 @@ + + + + + + + - + - + + + + - + + + + - --> + + + + + + + + +
+ 取 消 + 确 定 +
+