Loki/yudao-ui-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'lyt' of https://git.lotus-wallet.com/Loki/yudao-ui-admin into zyh

Browse Source
This commit is contained in:
Loki
2022-05-31 11:26:41 +08:00
parent f4de4383c0 80a5c40427
commit 4d040cc9ed
61 changed files with 636 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/erp/bill/AllocationOutList.vue
+2 -2
View File
@@ -211,6 +211,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/AssembleList.vue
+2 -2
View File
@@ -211,6 +211,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/DisassembleList.vue
+2 -2
View File
@@ -211,6 +211,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/InventoryReview.vue
+2 -2
View File
@@ -219,6 +219,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/OtherInList.vue
+2 -2
View File
@@ -229,6 +229,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/OtherOutList.vue
+2 -2
View File
@@ -229,6 +229,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/PurchaseBackList.vue
+2 -2
View File
@@ -241,6 +241,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/PurchaseInList.vue
+2 -2
View File
@@ -250,6 +250,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import "~@assets/less/common.less";
</style>
src/views/erp/bill/PurchaseOrderList.vue
+2 -2
View File
@@ -225,6 +225,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/RetailBackList.vue
+2 -2
View File
@@ -239,6 +239,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/RetailOutList.vue
+2 -2
View File
@@ -233,6 +233,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/SaleBackList.vue
+2 -2
View File
@@ -241,6 +241,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/SaleOrderList.vue
+2 -2
View File
@@ -240,6 +240,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/SaleOutList.vue
+2 -2
View File
@@ -249,6 +249,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/bill/mixins/BillListMixin.js
+1 -1
View File
@@ -114,7 +114,7 @@ export const BillListMixin = {
});
},
getDepotData() {
getAction('/depot/findDepotByCurrentUser').then((res)=>{
getAction('erp/depot/findDepotByCurrentUser').then((res)=>{
if(res.code === 200){
this.depotList = res.data;
}else{
src/views/erp/bill/mixins/BillModalMixin.js
+4 -4
View File
@@ -58,7 +58,7 @@ export const BillModalMixin = {
},
methods: {
addInit(amountNum) {
getAction('/sequence/buildNumber').then((res) => {
getAction('/erp/sequence/buildNumber').then((res) => {
if (res && res.code === 200) {
this.form.setFieldsValue({'number':amountNum + res.data.defaultNumber})
}
@@ -83,7 +83,7 @@ export const BillModalMixin = {
this.manyAccountBtnStatus = false
},
copyAddInit(amountNum) {
getAction('/sequence/buildNumber').then((res) => {
getAction('/erp/sequence/buildNumber').then((res) => {
if (res && res.code === 200) {
this.form.setFieldsValue({'number':amountNum + res.data.defaultNumber})
}
@@ -169,7 +169,7 @@ export const BillModalMixin = {
},
initDepot() {
let that = this;
getAction('/depot/findDepotByCurrentUser').then((res) => {
getAction('/erp/depot/findDepotByCurrentUser').then((res) => {
if(res.code === 200){
let arr = res.data
for(let item of that.materialTable.columns){
@@ -311,7 +311,7 @@ export const BillModalMixin = {
},
onAdded(event) {
const { row, target } = event
getAction('/depot/findDepotByCurrentUser').then((res) => {
getAction('/erp/depot/findDepotByCurrentUser').then((res) => {
if (res.code === 200) {
let arr = res.data
for (let i = 0; i < arr.length; i++) {
src/views/erp/financial/AdvanceInList.vue
+2 -2
View File
@@ -195,6 +195,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/financial/GiroList.vue
+2 -2
View File
@@ -182,6 +182,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/financial/ItemInList.vue
+2 -2
View File
@@ -195,6 +195,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/financial/ItemOutList.vue
+2 -2
View File
@@ -194,6 +194,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/financial/MoneyInList.vue
+2 -2
View File
@@ -198,6 +198,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/financial/MoneyOutList.vue
+2 -2
View File
@@ -198,6 +198,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/material/MaterialAttributeList.vue
+5 -5
View File
@@ -75,9 +75,9 @@
}
],
url: {
list: "/materialAttribute/list",
delete: "/materialAttribute/delete",
deleteBatch: "/materialAttribute/deleteBatch"
list: "/erp/materialAttribute/list",
delete: "/erp/materialAttribute/delete",
deleteBatch: "/erp/materialAttribute/deleteBatch"
}
}
},
@@ -89,6 +89,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/material/MaterialList.vue
+2 -2
View File
@@ -289,6 +289,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/material/MaterialPropertyList.vue
+2 -2
View File
@@ -118,6 +118,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/material/modules/MaterialModal.vue
+1 -1
View File
@@ -736,7 +736,7 @@
let params = {};
params.currentPage = 1;
params.pageSize = 100;
getAction('/unit/list', params).then((res) => {
getAction('/erp/unit/list', params).then((res) => {
if(res){
that.unitList = res.data.rows;
that.unitList.forEach(item => {
src/views/erp/report/AccountReport.vue
+2 -2
View File
@@ -176,6 +176,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/AllocationDetail.vue
+2 -2
View File
@@ -253,6 +253,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/BuyInReport.vue
+2 -2
View File
@@ -159,6 +159,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/CustomerAccount.vue
+2 -2
View File
@@ -241,6 +241,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/InDetail.vue
+2 -2
View File
@@ -245,6 +245,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/InMaterialCount.vue
+2 -2
View File
@@ -215,6 +215,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/InOutStockReport.vue
+2 -2
View File
@@ -221,6 +221,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/MaterialStock.vue
+2 -2
View File
@@ -266,6 +266,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/OutDetail.vue
+2 -2
View File
@@ -245,6 +245,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/OutMaterialCount.vue
+2 -2
View File
@@ -215,6 +215,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/SaleOutReport.vue
+2 -2
View File
@@ -167,6 +167,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/StockWarningReport.vue
+2 -2
View File
@@ -166,6 +166,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/VendorAccount.vue
+2 -2
View File
@@ -242,6 +242,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/batchStock.vue
+1 -1
View File
@@ -168,6 +168,6 @@
}
}
</script>
<style scoped>
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/modules/AccountInOutList.vue
+2 -2
View File
@@ -158,6 +158,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/modules/MaterialInOutList.vue
+2 -2
View File
@@ -128,6 +128,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/AccountList.vue
+2 -2
View File
@@ -175,6 +175,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/CustomerList.vue
+2 -2
View File
@@ -189,6 +189,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/DepotList.vue
+2 -2
View File
@@ -172,6 +172,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/FunctionList.vue
+2 -2
View File
@@ -140,6 +140,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/InOutItemList.vue
+2 -2
View File
@@ -153,6 +153,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/LogList.vue
+2 -2
View File
@@ -183,6 +183,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/MemberList.vue
+2 -2
View File
@@ -185,6 +185,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/PersonList.vue
+2 -2
View File
@@ -153,6 +153,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/PlatformConfigList.vue
+2 -2
View File
@@ -101,6 +101,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/PluginList.vue
+2 -2
View File
@@ -247,6 +247,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/RoleList.vue
+2 -2
View File
@@ -189,6 +189,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/SystemConfigList.vue
+2 -2
View File
@@ -169,6 +169,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/TenantList.vue
+2 -2
View File
@@ -155,6 +155,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/UnitList.vue
+5 -5
View File
@@ -137,9 +137,9 @@
}
],
url: {
list: "/unit/list",
delete: "/unit/delete",
deleteBatch: "/unit/deleteBatch"
list: "/erp/unit/list",
delete: "/erp/unit/delete",
deleteBatch: "/erp/unit/deleteBatch"
}
}
},
@@ -158,6 +158,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/UserList.vue
+2 -2
View File
@@ -208,6 +208,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/system/VendorList.vue
+2 -2
View File
@@ -188,6 +188,6 @@
}
}
</script>
<style scoped>
@import '~@assets/less/common.less'
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>