czg_team/cashier-web
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into test

Browse Source
This commit is contained in:
gyq
2025-12-18 11:33:18 +08:00
parent e72188a3f2 2635add6d2
commit 5c15f08733
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/data/index.vue
View File

@@ -709,11 +709,12 @@ export default {
*/ */
async geiShopList() { async geiShopList() {
try { try {
let shopInfo = JSON.parse(localStorage.getItem('userInfo')) if (this.shopInfo.isHeadShop) {
if (shopInfo.isHeadShop) {
let res = await ShopApi.getBranchList() let res = await ShopApi.getBranchList()
this.branchList = res; this.branchList = res;
this.shopId = res[0].shopId this.shopId = res[0].shopId
} else {
this.shopId = this.shopInfo.id
} }
} catch (error) { } catch (error) {
console.log('获取分店列表===', error); console.log('获取分店列表===', error);

15
src/views/data/sales.vue
View File

@@ -255,15 +255,12 @@ export default {
* 获取分店列表 * 获取分店列表
*/ */
async geiShopList() { async geiShopList() {
try { if (this.shopInfo.isHeadShop) {
let shopInfo = JSON.parse(localStorage.getItem('userInfo')) let res = await ShopApi.getBranchList()
if (shopInfo.isHeadShop) { this.branchList = res;
let res = await ShopApi.getBranchList() this.shopId = res[0].shopId
this.branchList = res; } else {
this.shopId = res[0].shopId this.shopId = this.shopInfo.id
}
} catch (error) {
console.log('获取分店列表===', error);
} }
}, },
totalfilter(item, d) { totalfilter(item, d) {

15
src/views/data/table.vue
View File

@@ -158,15 +158,12 @@ export default {
* 获取分店列表 * 获取分店列表
*/ */
async geiShopList() { async geiShopList() {
try { if (this.shopInfo.isHeadShop) {
let shopInfo = JSON.parse(localStorage.getItem('userInfo')) let res = await ShopApi.getBranchList()
if (shopInfo.isHeadShop) { this.branchList = res;
let res = await ShopApi.getBranchList() this.shopId = res[0].shopId
this.branchList = res; } else {
this.shopId = res[0].shopId this.shopId = this.shopInfo.id
}
} catch (error) {
console.log('获取分店列表===', error);
} }
}, },
//携带table id跳转到订单列表页面 //携带table id跳转到订单列表页面

6
src/views/tool/table/index.vue
View File

@@ -347,14 +347,14 @@ async function areainit() {
} }
async function diancanShow(item, key) { async function diancanShow(item, key) {
if (!key) { if (!key) {
router.push({ path: "/tool/index", query: { tableCode: item.tableCode } }); router.push({ path: "/Instead", query: { tableCode: item.tableCode } });
return; return;
} }
if (key == "isAddGoods") { if (key == "isAddGoods") {
router.push({ path: "/tool/index", query: { id: item.orderId, key } }); router.push({ path: "/Instead", query: { id: item.orderId, key } });
} }
if (key == "isPayOrder") { if (key == "isPayOrder") {
router.push({ path: "/tool/index", query: { id: item.orderId, key } }); router.push({ path: "/Instead", query: { id: item.orderId, key } });
} }
} }
const tabClick = (tab) => { const tabClick = (tab) => {