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

修复样式 更改接口

Browse Source
This commit is contained in:
Loki
2022-05-31 17:38:15 +08:00
parent 4d040cc9ed
commit faa5194e54
351 changed files with 128774 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue
+1 -1
View File
@@ -12,7 +12,7 @@
</el-table-column>
<el-table-column label="规则范围" align="center" prop="options" width="440px">
<template slot-scope="scope">
<el-tag size="medium" v-if="scope.row.options" v-for="option in scope.row.options">
<el-tag size="medium" v-if="scope.row.options" v-for="option in scope.row.options" :key="option">
{{ getAssignRuleOptionName(scope.row.type, option) }}
</el-tag>
</template>
src/views/erp/bill/dialog/LinkBillList.vue
+1 -1
View File
@@ -84,7 +84,7 @@
}
],
url: {
list: "/depotHead/list"
list: "/erp/depotHead/list"
}
}
},
src/views/erp/bill/mixins/BillListMixin.js
+1 -1
View File
@@ -13,7 +13,7 @@ export const BillListMixin = {
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
},
isBatchDelEnabled: function () {
src/views/erp/bill/modules/AllocationOutModal.vue
+3 -3
View File
@@ -170,9 +170,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/AssembleModal.vue
+3 -3
View File
@@ -170,9 +170,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/DisassembleModal.vue
+3 -3
View File
@@ -170,9 +170,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/InventoryReviewModal.vue
+3 -3
View File
@@ -188,9 +188,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/OtherInModal.vue
+3 -3
View File
@@ -196,9 +196,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/OtherOutModal.vue
+3 -3
View File
@@ -194,9 +194,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/PurchaseBackModal.vue
+3 -3
View File
@@ -271,9 +271,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/PurchaseInModal.vue
+3 -3
View File
@@ -407,9 +407,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/PurchaseOrderModal.vue
+3 -3
View File
@@ -204,9 +204,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/RetailBackModal.vue
+3 -3
View File
@@ -251,9 +251,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/RetailOutModal.vue
+3 -3
View File
@@ -264,9 +264,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/SaleBackModal.vue
+3 -3
View File
@@ -278,9 +278,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/SaleOrderModal.vue
+3 -3
View File
@@ -209,9 +209,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/bill/modules/SaleOutModal.vue
+3 -3
View File
@@ -294,9 +294,9 @@
}
},
url: {
add: '/depotHead/addDepotHeadAndDetail',
edit: '/depotHead/updateDepotHeadAndDetail',
detailList: '/depotItem/getDetailList'
add: '/erp/depotHead/addDepotHeadAndDetail',
edit: '/erp/depotHead/updateDepotHeadAndDetail',
detailList: '/erp/depotItem/getDetailList'
}
}
},
src/views/erp/financial/dialog/DebtBillList.vue
+1 -1
View File
@@ -132,7 +132,7 @@
}
],
url: {
list: "/depotHead/debtList"
list: "/erp/depotHead/debtList"
}
}
},
src/views/erp/financial/mixins/FinancialListMixin.js
+1 -1
View File
@@ -13,7 +13,7 @@ export const FinancialListMixin = {
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
},
isBatchDelEnabled: function () {
src/views/erp/financial/modules/AdvanceInModal.vue
+3 -3
View File
@@ -169,9 +169,9 @@
}
},
url: {
add: '/accountHead/addAccountHeadAndDetail',
edit: '/accountHead/updateAccountHeadAndDetail',
detailList: '/accountItem/getDetailList'
add: '/erp/accountHead/addAccountHeadAndDetail',
edit: '/erp/accountHead/updateAccountHeadAndDetail',
detailList: '/erp/accountItem/getDetailList'
}
}
},
src/views/erp/financial/modules/GiroModal.vue
+3 -3
View File
@@ -180,9 +180,9 @@
}
},
url: {
add: '/accountHead/addAccountHeadAndDetail',
edit: '/accountHead/updateAccountHeadAndDetail',
detailList: '/accountItem/getDetailList'
add: '/erp/accountHead/addAccountHeadAndDetail',
edit: '/erp/accountHead/updateAccountHeadAndDetail',
detailList: '/erp/accountItem/getDetailList'
}
}
},
src/views/erp/financial/modules/ItemInModal.vue
+3 -3
View File
@@ -193,9 +193,9 @@
}
},
url: {
add: '/accountHead/addAccountHeadAndDetail',
edit: '/accountHead/updateAccountHeadAndDetail',
detailList: '/accountItem/getDetailList'
add: '/erp/accountHead/addAccountHeadAndDetail',
edit: '/erp/accountHead/updateAccountHeadAndDetail',
detailList: '/erp/accountItem/getDetailList'
}
}
},
src/views/erp/financial/modules/ItemOutModal.vue
+3 -3
View File
@@ -193,9 +193,9 @@
}
},
url: {
add: '/accountHead/addAccountHeadAndDetail',
edit: '/accountHead/updateAccountHeadAndDetail',
detailList: '/accountItem/getDetailList'
add: '/erp/accountHead/addAccountHeadAndDetail',
edit: '/erp/accountHead/updateAccountHeadAndDetail',
detailList: '/erp/accountItem/getDetailList'
}
}
},
src/views/erp/financial/modules/MoneyInModal.vue
+3 -3
View File
@@ -215,9 +215,9 @@
}
},
url: {
add: '/accountHead/addAccountHeadAndDetail',
edit: '/accountHead/updateAccountHeadAndDetail',
detailList: '/accountItem/getDetailList'
add: '/erp/accountHead/addAccountHeadAndDetail',
edit: '/erp/accountHead/updateAccountHeadAndDetail',
detailList: '/erp/accountItem/getDetailList'
}
}
},
src/views/erp/financial/modules/MoneyOutModal.vue
+3 -3
View File
@@ -218,9 +218,9 @@
}
},
url: {
add: '/accountHead/addAccountHeadAndDetail',
edit: '/accountHead/updateAccountHeadAndDetail',
detailList: '/accountItem/getDetailList'
add: '/erp/accountHead/addAccountHeadAndDetail',
edit: '/erp/accountHead/updateAccountHeadAndDetail',
detailList: '/erp/accountItem/getDetailList'
}
}
},
src/views/erp/material/MaterialCategoryList.vue
+1 -1
View File
@@ -161,7 +161,7 @@ export default {
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/material/MaterialList.vue
+8 -8
View File
@@ -215,13 +215,13 @@
{title: '最低售价', dataIndex: 'lowDecimal', align: 'center', width: 80}
],
url: {
list: "/material/list",
delete: "/material/delete",
deleteBatch: "/material/deleteBatch",
importExcelUrl: "/material/importExcel",
exportXlsUrl: "/material/exportExcel",
batchSetStatusUrl: "/material/batchSetStatus",
batchSetMaterialCurrentStockUrl: "/material/batchSetMaterialCurrentStock"
list: "/erp/material/list",
delete: "/erp/material/delete",
deleteBatch: "/erp/material/deleteBatch",
importExcelUrl: "/erp/material/importExcel",
exportXlsUrl: "/erp/material/exportExcel",
batchSetStatusUrl: "/erp/material/batchSetStatus",
batchSetMaterialCurrentStockUrl: "/erp/material/batchSetMaterialCurrentStock"
}
}
},
@@ -231,7 +231,7 @@
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/material/MaterialPropertyList.vue
+3 -3
View File
@@ -104,9 +104,9 @@
}
],
url: {
list: "/materialProperty/list",
delete: "/materialProperty/delete",
deleteBatch: "/materialProperty/deleteBatch"
list: "/erp/materialProperty/list",
delete: "/erp/materialProperty/delete",
deleteBatch: "/erp/materialProperty/deleteBatch"
}
}
},
src/views/erp/material/modules/MaterialCategoryModal.vue
+1 -1
View File
@@ -76,7 +76,7 @@
serialNo: {rules: [{required: true, message: '请输入编号!'}]}
},
url: {
add: "/materialCategory/add",
add: "/erp/materialCategory/add",
}
}
},
src/views/erp/material/modules/MaterialModal.vue
+4 -4
View File
@@ -415,10 +415,10 @@
}
},
url: {
add: '/material/add',
edit: '/material/update',
materialsExtendList: '/materialsExtend/getDetailList',
depotWithStock: '/depot/getAllListWithStock'
add: '/erp/material/add',
edit: '/erp/material/update',
materialsExtendList: '/erp/materialsExtend/getDetailList',
depotWithStock: '/erp/depot/getAllListWithStock'
},
}
},
src/views/erp/report/AccountReport.vue
+2 -2
View File
@@ -129,8 +129,8 @@
}
],
url: {
list: "/account/list",
getStatistics: "/account/getStatistics"
list: "/erp/account/list",
getStatistics: "/erp/account/getStatistics"
}
}
},
src/views/erp/report/AllocationDetail.vue
+1 -1
View File
@@ -186,7 +186,7 @@
{title: '备注', dataIndex: 'newRemark', width: 100}
],
url: {
list: "/depotHead/findAllocationDetail",
list: "/erp/depotHead/findAllocationDetail",
}
}
},
src/views/erp/report/BuyInReport.vue
+1 -1
View File
@@ -122,7 +122,7 @@
{title: '实际采购金额', dataIndex: 'inOutSumPrice', sorter: (a, b) => a.inOutSumPrice - b.inOutSumPrice, width: 100}
],
url: {
list: "/depotItem/buyIn"
list: "/erp/depotItem/buyIn"
}
}
},
src/views/erp/report/CustomerAccount.vue
+1 -1
View File
@@ -153,7 +153,7 @@
{title: '单据日期', dataIndex: 'oTime', width: 160}
],
url: {
list: "/depotHead/findStatementAccount",
list: "/erp/depotHead/findStatementAccount",
}
}
},
src/views/erp/report/InDetail.vue
+1 -1
View File
@@ -178,7 +178,7 @@
{title: '备注', dataIndex: 'newRemark', width: 100}
],
url: {
list: "/depotHead/findInDetail",
list: "/erp/depotHead/findInDetail",
}
}
},
src/views/erp/report/InMaterialCount.vue
+1 -1
View File
@@ -156,7 +156,7 @@
{title: '入库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}
],
url: {
list: "/depotHead/findInOutMaterialCount",
list: "/erp/depotHead/findInOutMaterialCount",
}
}
},
src/views/erp/report/InOutStockReport.vue
+3 -3
View File
@@ -147,9 +147,9 @@
{title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60}
],
url: {
list: "/depotItem/findByAll",
totalCountMoney: "/depotItem/totalCountMoney",
exportXlsUrl: "/depotItem/exportExcel"
list: "/erp/depotItem/findByAll",
totalCountMoney: "/erp/depotItem/totalCountMoney",
exportXlsUrl: "/erp/depotItem/exportExcel"
}
}
},
src/views/erp/report/MaterialStock.vue
+1 -1
View File
@@ -180,7 +180,7 @@
}
],
url: {
list: "/material/getListWithStock"
list: "/erp/material/getListWithStock"
}
}
},
src/views/erp/report/OutDetail.vue
+1 -1
View File
@@ -178,7 +178,7 @@
{title: '备注', dataIndex: 'newRemark', width: 100}
],
url: {
list: "/depotHead/findInDetail",
list: "/erp/depotHead/findInDetail",
}
}
},
src/views/erp/report/OutMaterialCount.vue
+1 -1
View File
@@ -156,7 +156,7 @@
{title: '出库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}
],
url: {
list: "/depotHead/findInOutMaterialCount",
list: "/erp/depotHead/findInOutMaterialCount",
}
}
},
src/views/erp/report/SaleOutReport.vue
+1 -1
View File
@@ -127,7 +127,7 @@
{title: '实际销售金额', dataIndex: 'outInSumPrice', sorter: (a, b) => a.outInSumPrice - b.outInSumPrice, width: 100}
],
url: {
list: "/depotItem/saleOut"
list: "/erp/depotItem/saleOut"
}
}
},
src/views/erp/report/StockWarningReport.vue
+1 -1
View File
@@ -129,7 +129,7 @@
{title: '建议出库量', dataIndex: 'highCritical', sorter: (a, b) => a.highCritical - b.highCritical, width: 80}
],
url: {
list: "/depotItem/findStockWarningCount"
list: "/erp/depotItem/findStockWarningCount"
}
}
},
src/views/erp/report/VendorAccount.vue
+1 -1
View File
@@ -154,7 +154,7 @@
{title: '单据日期', dataIndex: 'oTime', width: 160}
],
url: {
list: "/depotHead/findStatementAccount",
list: "/erp/depotHead/findStatementAccount",
}
}
},
src/views/erp/report/batchStock.vue
+1 -1
View File
@@ -131,7 +131,7 @@
{title: '库存', dataIndex: 'stock', width: 80}
],
url: {
list: "/depotItem/batchStock"
list: "/erp/depotItem/batchStock"
}
}
},
src/views/erp/report/modules/AccountInOutList.vue
+1 -1
View File
@@ -108,7 +108,7 @@
sm: { span: 16 },
},
url: {
list: "/account/findAccountInOutList"
list: "/erp/account/findAccountInOutList"
}
}
},
src/views/erp/report/modules/MaterialInOutList.vue
+1 -1
View File
@@ -88,7 +88,7 @@
sm: { span: 16 },
},
url: {
list: "/depotItem/findDetailByTypeAndMaterialId"
list: "/erp/depotItem/findDetailByTypeAndMaterialId"
}
}
},
src/views/erp/system/AccountList.vue
+4 -4
View File
@@ -139,10 +139,10 @@
}
],
url: {
list: "/account/list",
delete: "/account/delete",
deleteBatch: "/account/deleteBatch",
setDefault: "/account/updateIsDefault"
list: "/erp/account/list",
delete: "/erp/account/delete",
deleteBatch: "/erp/account/deleteBatch",
setDefault: "/erp/account/updateIsDefault"
}
}
},
src/views/erp/system/CustomerList.vue
+7 -7
View File
@@ -157,18 +157,18 @@
}
],
url: {
list: "/supplier/list",
delete: "/supplier/delete",
deleteBatch: "/supplier/deleteBatch",
importExcelUrl: "/supplier/importCustomer",
exportXlsUrl: "/supplier/exportExcel",
batchSetStatusUrl: "/supplier/batchSetStatus"
list: "/erp/supplier/list",
delete: "/erp/supplier/delete",
deleteBatch: "/erp/supplier/deleteBatch",
importExcelUrl: "/erp/supplier/importCustomer",
exportXlsUrl: "/erp/supplier/exportExcel",
batchSetStatusUrl: "/erp/supplier/batchSetStatus"
}
}
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/system/DepotList.vue
+4 -4
View File
@@ -136,10 +136,10 @@
}
],
url: {
list: "/depot/list",
delete: "/depot/delete",
deleteBatch: "/depot/deleteBatch",
setDefault: "/depot/updateIsDefault"
list: "/erp/depot/list",
delete: "/erp/depot/delete",
deleteBatch: "/erp/depot/deleteBatch",
setDefault: "/erp/depot/updateIsDefault"
}
}
},
src/views/erp/system/FunctionList.vue
+3 -3
View File
@@ -126,9 +126,9 @@
}
],
url: {
list: "/function/list",
delete: "/function/delete",
deleteBatch: "/function/deleteBatch"
list: "/erp/function/list",
delete: "/erp/function/delete",
deleteBatch: "/erp/function/deleteBatch"
}
}
},
src/views/erp/system/InOutItemList.vue
+3 -3
View File
@@ -132,9 +132,9 @@
}
],
url: {
list: "/inOutItem/list",
delete: "/inOutItem/delete",
deleteBatch: "/inOutItem/deleteBatch"
list: "/erp/inOutItem/list",
delete: "/erp/inOutItem/delete",
deleteBatch: "/erp/inOutItem/deleteBatch"
}
}
},
src/views/erp/system/LogList.vue
+1 -1
View File
@@ -151,7 +151,7 @@
offset: 1
},
url: {
list: "/log/list",
list: "/erp/log/list",
}
}
},
src/views/erp/system/MemberList.vue
+7 -7
View File
@@ -153,18 +153,18 @@
}
],
url: {
list: "/supplier/list",
delete: "/supplier/delete",
deleteBatch: "/supplier/deleteBatch",
importExcelUrl: "/supplier/importMember",
exportXlsUrl: "/supplier/exportExcel",
batchSetStatusUrl: "/supplier/batchSetStatus"
list: "/erp/supplier/list",
delete: "/erp/supplier/delete",
deleteBatch: "/erp/supplier/deleteBatch",
importExcelUrl: "/erp/supplier/importMember",
exportXlsUrl: "/erp/supplier/exportExcel",
batchSetStatusUrl: "/erp/supplier/batchSetStatus"
}
}
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/system/MsgList.vue
+3 -3
View File
@@ -110,9 +110,9 @@
width: 50
}],
url: {
list: "/msg/list",
batchUpdateStatus:"/msg/batchUpdateStatus",
readAllMsg:"/msg/readAllMsg",
list: "/erp/msg/list",
batchUpdateStatus:"/erp/msg/batchUpdateStatus",
readAllMsg:"/erp/msg/readAllMsg",
},
loading:false,
openPath:'',
src/views/erp/system/OrganizationList.vue
+1 -1
View File
@@ -162,7 +162,7 @@ export default {
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/system/PersonList.vue
+3 -3
View File
@@ -132,9 +132,9 @@
}
],
url: {
list: "/person/list",
delete: "/person/delete",
deleteBatch: "/person/deleteBatch"
list: "/erp/person/list",
delete: "/erp/person/delete",
deleteBatch: "/erp/person/deleteBatch"
}
}
},
src/views/erp/system/PlatformConfigList.vue
+3 -3
View File
@@ -83,9 +83,9 @@
}
],
url: {
list: "/platformConfig/list",
delete: "/platformConfig/delete",
deleteBatch: "/platformConfig/deleteBatch"
list: "/erp/platformConfig/list",
delete: "/erp/platformConfig/delete",
deleteBatch: "/erp/platformConfig/deleteBatch"
},
}
},
src/views/erp/system/PluginList.vue
+5 -5
View File
@@ -164,16 +164,16 @@
}
],
url: {
list: "/plugin/list",
delete: "/plugin/delete",
deleteBatch: "/plugin/deleteBatch",
importJarUrl: "/plugin/uploadInstallPluginJar",
list: "/erp/plugin/list",
delete: "/erp/plugin/delete",
deleteBatch: "/erp/plugin/deleteBatch",
importJarUrl: "/erp/plugin/uploadInstallPluginJar",
}
}
},
computed: {
importUrl: function () {
return `${window._CONFIG['domianURL']}${this.url.importJarUrl}`;
return `${process.env.VUE_APP_BASE_API}${this.url.importJarUrl}`;
}
},
methods: {
src/views/erp/system/RoleList.vue
+4 -4
View File
@@ -144,15 +144,15 @@
}
],
url: {
list: "/role/list",
delete: "/role/delete",
deleteBatch: "/role/deleteBatch"
list: "/erp/role/list",
delete: "/erp/role/delete",
deleteBatch: "/erp/role/deleteBatch"
},
}
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}/${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/system/TenantList.vue
+2 -2
View File
@@ -144,8 +144,8 @@
}
],
url: {
list: "/tenant/list",
batchSetStatusUrl: "/tenant/batchSetStatus"
list: "/erp/tenant/list",
batchSetStatusUrl: "/erp/tenant/batchSetStatus"
},
}
},
src/views/erp/system/UserList.vue
+5 -5
View File
@@ -147,11 +147,11 @@
}
],
url: {
list: "/user/list",
delete: "/user/delete",
deleteBatch: "/user/deleteBatch",
resetPwd: "/user/resetPwd",
batchSetStatusUrl: "/user/batchSetStatus"
list: "/erp/user/list",
delete: "/erp/user/delete",
deleteBatch: "/erp/user/deleteBatch",
resetPwd: "/erp/user/resetPwd",
batchSetStatusUrl: "/erp/user/batchSetStatus"
},
}
},
src/views/erp/system/VendorList.vue
+7 -7
View File
@@ -156,18 +156,18 @@
}
],
url: {
list: "/supplier/list",
delete: "/supplier/delete",
deleteBatch: "/supplier/deleteBatch",
importExcelUrl: "/supplier/importVendor",
exportXlsUrl: "/supplier/exportExcel",
batchSetStatusUrl: "/supplier/batchSetStatus"
list: "/erp/supplier/list",
delete: "/erp/supplier/delete",
deleteBatch: "/erp/supplier/deleteBatch",
importExcelUrl: "/erp/supplier/importVendor",
exportXlsUrl: "/erp/supplier/exportExcel",
batchSetStatusUrl: "/erp/supplier/batchSetStatus"
}
}
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
return `${process.env.VUE_APP_BASE_API}${this.url.importExcelUrl}`;
}
},
methods: {
src/views/erp/system/modules/OrganizationModal.vue
+1 -1
View File
@@ -78,7 +78,7 @@
orgNo: {rules: [{required: true, message: '请输入编码!'}]}
},
url: {
add: "/organization/add",
add: "/erp/organization/add",
}
}
},
src/views/erp/system/modules/RolePushBtnModal.vue
+1 -1
View File
@@ -107,7 +107,7 @@
}
],
url: {
list: "/function/findRoleFunctionsById"
list: "/erp/function/findRoleFunctionsById"
}
}
},
src/views/login.vue
+4 -2
View File
@@ -174,9 +174,11 @@ export default {
Cookies.remove('tenantName');
}
// 发起登陆
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$store.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
}).catch((err) => {
console.log(err);
this.loading = false;
this.getCode();
});
src/views/pay/refund/index.vue
+9 -9
View File
@@ -74,7 +74,7 @@
<!-- <el-table-column label="商户名称" align="center" prop="merchantName" width="120"/>-->
<!-- <el-table-column label="应用名称" align="center" prop="appName" width="120"/>-->
<el-table-column label="支付渠道" align="center" width="130">
<template v-slot="scope">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<p>商户名称: {{ scope.row.merchantName }}</p>
<p>应用名称: {{ scope.row.appName }}</p>
@@ -88,7 +88,7 @@
<!-- <el-table-column label="交易订单号" align="center" prop="tradeNo" width="140"/>-->
<!-- <el-table-column label="商户订单编号" align="center" prop="merchantOrderId" width="140"/>-->
<el-table-column label="商户订单号" align="left" width="230">
<template v-slot="scope">
<template slot-scope="scope">
<p class="order-font">
<el-tag size="mini">退款</el-tag>
{{ scope.row.merchantRefundNo }}
@@ -100,7 +100,7 @@
</template>
</el-table-column>
<el-table-column label="支付订单号" align="center" prop="merchantRefundNo" width="250">
<template v-slot="scope">
<template slot-scope="scope">
<p class="order-font">
<el-tag size="mini">交易</el-tag>
{{ scope.row.tradeNo }}
@@ -112,27 +112,27 @@
</template>
</el-table-column>
<el-table-column label="支付金额(元)" align="center" prop="payAmount" width="100">
<template v-slot="scope" class="">
<template slot-scope="scope" class="">
￥{{ parseFloat(scope.row.payAmount / 100).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="100">
<template scope="scope">
<template slot-scope="scope">
￥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="退款类型" align="center" prop="type" width="80">
<template v-slot="scope">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="退款状态" align="center" prop="status">
<template v-slot="scope">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="回调状态" align="center" prop="notifyStatus">
<template v-slot="scope">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.PAY_ORDER_NOTIFY_STATUS" :value="scope.row.notifyStatus" />
</template>
</el-table-column>
@@ -183,7 +183,7 @@
<el-tag class="tag-purple" size="mini">{{ parseFloat(refundDetail.refundAmount / 100).toFixed(2) }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="退款类型">
<template v-slot="scope">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.PAY_REFUND_ORDER_TYPE" :value="refundDetail.type" />
</template>
</el-descriptions-item>
src/views/system/sensitiveWord/index.vue
+1 -1
View File
@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<el-tag :disable-transitions="true" v-for="(tag, index) in scope.row.tags" :index="index">
<el-tag :disable-transitions="true" v-for="(tag, index) in scope.row.tags" :key="index" :index="index">
{{ tag }}
</el-tag>
</template>