cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate

Browse Source
This commit is contained in:
杨建炊 2024-08-24 14:51:25 +08:00
commit d8f181a033
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/dist/css/397.8133208a.css → public/dist/css/343.21883185.css vendored
View File

@ -1 +1 @@
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-7f7daa61]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-7f7daa61]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.imgBox .img[data-v-7f7daa61]{width:55px;height:55px;border-radius:4px;margin:3px}
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-59efa2f0]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-59efa2f0]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.imgBox .img[data-v-59efa2f0]{width:55px;height:55px;border-radius:4px;margin:3px}

2
public/dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.6cc6b1ea.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.06b588a5.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
public/dist/js/343.32c5a5db.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/343.32c5a5db.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/397.dd3dd707.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/397.dd3dd707.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.06b588a5.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.6cc6b1ea.js.map → public/dist/js/app.06b588a5.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.6cc6b1ea.js vendored
View File

File diff suppressed because one or more lines are too long

8
resources/frontend/src/views/plat/afterSaleOrder.vue
View File

@ -45,7 +45,7 @@
<el-table v-loading="loading" :data="afterList" style="width: 100%" border>
<el-table-column prop="after_sales_biz_sn" label="售后单编号" />
<el-table-column prop="order_sn" label="父订单编号" />
<el-table-column label="门店id">
<el-table-column label="店铺">
<template slot-scope="scope">
<span>{{ Shops[scope.row.shop_id] }}</span>
</template>
@ -76,7 +76,7 @@
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
layout="prev, pager, next, jumper, sizes, total"
layout="prev, pager, next, sizes, total, jumper"
:total="total">
</el-pagination>
</div>
@ -126,7 +126,7 @@ export default {
'6': '待(顾客)退货',
'7': '待(团长)确认退货',
'8': '(顾客)撤销',
'9': '(系统)关闭',
'9': '(系统)关闭'
}
}
},
@ -175,8 +175,8 @@ export default {
}
},
mounted() {
this.fetchList()
this.getShopsList()
this.fetchList()
}
}
</script>