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

Merge branch 'zyh' into zyj

Browse Source
This commit is contained in:
小久哥
2022-06-01 17:30:29 +08:00
parent a2e613c102 faa5194e54
commit 78b68efdc8
377 changed files with 129410 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+9 -1
View File
@@ -1,12 +1,20 @@
<template>
<div id="app">
<a-config-provider :locale="locale">
<div id="app">
<router-view />
</div>
</a-config-provider>
</template>
<script>
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
export default {
name: 'App',
data () {
return {
locale: zhCN,
}
},
metaInfo() {
return {
title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
src/api/api.js
+2 -2
View File
@@ -31,7 +31,7 @@ const getPersonByNumType = (params)=>getAction("/erp/person/getPersonByNumType",
const addAccount = (params)=>postAction("/erp/account/add",params);
const editAccount = (params)=>putAction("/erp/account/update",params);
const checkAccount = (params)=>getAction("/erp/account/checkIsNameExist",params);
const getAccount = (params)=>getAction("/erp/account/getAccount",params);
const getAccount = (params)=>getAction("/system/user/page",params);
//收支项目
const addInOutItem = (params)=>postAction("/erp/inOutItem/add",params);
const editInOutItem = (params)=>putAction("/erp/inOutItem/update",params);
@@ -105,7 +105,7 @@ const getBatchNumberList = (params)=>getAction("/erp/depotItem/getBatchNumberLis
const findFinancialDetailByNumber = (params)=>getAction("/erp/accountHead/getDetailByNumber",params);
//租户信息
const getAlltenantInfo = (params)=>getAction("/erp/tenant/listAllTenant",params);
const getAlltenantInfo = (params)=>getAction("/system/tenant/page",params);
export {
getBuyAndSaleStatistics,
buyOrSalePrice,
src/api/manage.js
+1 -1
View File
@@ -183,7 +183,7 @@ export function getFileAccessHttpUrl(avatar,subStr) {
return avatar;
}else{
if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){
return window._CONFIG['domianURL'] + "/" + avatar;
return process.env.VUE_APP_BASE_API + "/" + avatar;
}
}
}
src/api/system/dictDetail.js
+52
View File
@@ -0,0 +1,52 @@
import request from '@/utils/request'
export function get(dictName) {
const params = {
dictName,
page: 0,
size: 9999
}
return request({
url: 'api/dictDetail',
method: 'get',
params
})
}
export function getDictMap(dictName) {
const params = {
dictName,
page: 0,
size: 9999
}
return request({
url: 'api/dictDetail/map',
method: 'get',
params
})
}
export function add(data) {
return request({
url: 'api/dictDetail',
method: 'post',
data
})
}
export function del(id) {
return request({
url: 'api/dictDetail/' + id,
method: 'delete'
})
}
export function edit(data) {
return request({
url: 'api/dictDetail',
method: 'put',
data
})
}
export default { add, edit, del }
src/assets/less/common.less
+504 -1
View File
@@ -71,4 +71,507 @@
/* 内嵌子表背景颜色 */
.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
background-color: #FFFFFF;
}
}
body {
/*打开滚动条固定显示*/
overflow-y: scroll;
&.colorWeak {
filter: invert(80%);
}
}
.layout {
min-height: 100vh !important;
overflow-x: hidden;
&.mobile {
.ant-layout-content {
.content {
margin: 24px 0 0;
}
}
/**
* ant-table-wrapper
* 覆盖的表格手机模式样式，如果想修改在手机上表格最低宽度，可以在这里改动
*/
.ant-table-wrapper {
.ant-table-content {
overflow-y: auto;
}
.ant-table-body {
min-width: 800px;
}
}
.sidemenu {
.ant-header-fixedHeader {
&.ant-header-side-opened, &.ant-header-side-closed {
width: 100%
}
}
}
.topmenu {
/* 必须为 topmenu 才能启用流式布局 */
&.content-width-Fluid {
.header-index-wide {
margin-left: 0;
}
}
}
.header, .top-nav-header-index {
.user-wrapper .action {
padding: 0 12px;
}
}
}
&.ant-layout-has-sider {
flex-direction: row;
}
.trigger {
font-size: 22px;
line-height: 42px;
padding: 0 18px;
cursor: pointer;
transition: color 300ms, background 300ms;
&:hover {
background: rgba(255, 255, 255, 0.3);
}
}
.topmenu {
.ant-header-fixedHeader {
position: fixed;
top: 0;
right: 0;
z-index: 9;
width: 100%;
transition: width .2s;
&.ant-header-side-opened {
width: 100%;
}
&.ant-header-side-closed {
width: 100%;
}
}
/* 必须为 topmenu 才能启用流式布局 */
&.content-width-Fluid {
.header-index-wide {
max-width: unset;
margin-left: 24px;
}
.page-header-index-wide {
max-width: unset;
}
}
}
.sidemenu {
.ant-header-fixedHeader {
position: fixed;
top: 0;
right: 0;
z-index: 9;
width: 100%;
transition: width .2s;
&.ant-header-side-opened {
width: calc(100% - 200px)
}
&.ant-header-side-closed {
width: calc(100% - 80px)
}
}
}
.header {
height: 64px;
padding: 0 12px 0 0;
background: #fff;
box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
position: relative;
}
.header, .top-nav-header-index {
.user-wrapper {
float: right;
height: 100%;
.action {
cursor: pointer;
padding: 0 14px;
display: inline-block;
transition: all .3s;
height: 70%;
line-height: 46px;
&.action-full {
height: 100%;
}
&:hover {
background: rgba(255, 255, 255, 0.3);
}
.avatar {
margin: 20px 10px 20px 0;
color: #1890ff;
background: hsla(0, 0%, 100%, .85);
vertical-align: middle;
}
.icon {
font-size: 16px;
padding: 4px;
}
.anticon {
color: white;
}
}
}
&.dark {
.user-wrapper {
.action {
color: black;
&:hover {
background: rgba(0, 0, 0, 0.05);
}
.anticon {
color: black;
}
}
}
}
}
&.mobile {
.top-nav-header-index {
.header-index-wide {
.header-index-left {
.trigger {
color: rgba(255, 255, 255, 0.85);
padding: 0 12px;
}
.logo.top-nav-header {
text-align: center;
width: 56px;
line-height: 58px;
}
}
}
.user-wrapper .action .avatar {
margin: 20px 0;
}
&.light {
.header-index-wide {
.header-index-left {
.trigger {
color: rgba(0, 0, 0, 0.65);
}
}
}
}
}
}
&.tablet {
/*overflow: hidden; text-overflow:ellipsis; white-space: nowrap;*/
.top-nav-header-index {
.header-index-wide {
.header-index-left {
.logo > a {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
}
}
.top-nav-header-index {
box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
position: relative;
transition: background .3s, width .2s;
.header-index-wide {
width: 100%;
margin: auto;
padding: 0 20px 0 0;
display: flex;
height: 59px;
.ant-menu.ant-menu-horizontal {
border: none;
height: 64px;
line-height: 64px;
}
.header-index-left {
flex: 1 1;
display: flex;
.logo.top-nav-header {
width: 165px;
height: 64px;
position: relative;
line-height: 64px;
transition: all .3s;
overflow: hidden;
img {
display: inline-block;
vertical-align: middle;
height: 32px;
}
h1 {
color: #fff;
display: inline-block;
vertical-align: top;
font-size: 16px;
margin: 0 0 0 12px;
font-weight: 400;
}
}
}
.header-index-right {
float: right;
height: 59px;
overflow: hidden;
.action:hover {
background-color: rgba(0, 0, 0, 0.05);
}
}
}
&.light {
background-color: #fff;
.header-index-wide {
.header-index-left {
.logo {
h1 {
color: #002140;
}
}
}
}
}
&.dark {
.user-wrapper {
.action {
color: white;
&:hover {
background: rgba(255, 255, 255, 0.3);
}
}
}
.header-index-wide .header-index-left .trigger:hover {
background: rgba(255, 255, 255, 0.3);
}
}
}
/*内容区*/
.layout-content {
margin: 24px 24px 0px;
height: 64px;
padding: 0 12px 0 0;
}
}
.topmenu {
.page-header-index-wide {
margin: 0 auto;
width: 100%;
}
}
/* drawer-sider 自定义*/
.ant-drawer.drawer-sider {
.sider {
box-shadow: none;
}
&.dark {
.ant-drawer-content {
background-color: rgb(0, 21, 41);
}
}
&.light {
box-shadow: none;
.ant-drawer-content {
background-color: #fff;
}
}
.ant-drawer-body {
padding: 0
}
}
/* 菜单样式*/
.sider {
box-shadow: 2px 116px 6px 0 rgba(0, 21, 41, .35);
position: relative;
z-index: 10;
&.ant-fixed-sidemenu {
position: fixed;
height: 100%;
}
.logo {
height: 64px;
position: relative;
line-height: 64px;
padding-left: 10px;
-webkit-transition: all .3s;
transition: all .3s;
background: #ffffff;
overflow: hidden;
img, h1 {
display: inline-block;
vertical-align: middle;
}
img {
height: 32px;
}
h1 {
color: #fff;
font-size: 18px;
margin: 0 0 10px 8px;
font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-weight: 600;
}
}
&.light {
background-color: #fff;
box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
.logo {
background: #fff;
box-shadow: 1px 1px 0 0 #e8e8e8;
h1 {
color: unset;
}
}
.ant-menu-light {
border-right-color: transparent;
}
}
}
/*外置的样式控制*/
.user-dropdown-menu-wrapper.ant-dropdown-menu {
padding: 4px 0;
.ant-dropdown-menu-item {
width: 160px;
}
.ant-dropdown-menu-item > .anticon:first-child,
.ant-dropdown-menu-item > a > .anticon:first-child,
.ant-dropdown-menu-submenu-title > .anticon:first-child
.ant-dropdown-menu-submenu-title > a > .anticon:first-child {
min-width: 12px;
margin-right: 8px;
}
}
/* 数据列表 样式*/
.table-alert {
margin-bottom: 16px;
}
.table-page-search-wrapper {
.ant-form-inline {
.ant-form-item {
display: flex;
margin-bottom: 24px;
margin-right: 0;
.ant-form-item-control-wrapper {
flex: 1 1;
display: inline-block;
vertical-align: middle;
}
> .ant-form-item-label {
line-height: 32px;
padding-right: 8px;
width: auto;
}
.ant-form-item-control {
height: 32px;
line-height: 32px;
}
}
}
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
}
.content {
.table-operator {
margin-bottom: 18px;
button {
margin-right: 8px;
}
}
}
src/assets/styles/sidebar.scss
+1 -1
View File
@@ -22,7 +22,7 @@
top: 0;
bottom: 0;
left: 0;
z-index: 1001;
z-index: 1000;
overflow: hidden;
-webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
box-shadow: 2px 0 6px rgba(0,21,41,.35);
src/components/bpmnProcessDesigner/src/highlight/index.js
+1 -1
View File
@@ -1,4 +1,4 @@
const hljs = require("highlight.js/lib/core");
const hljs = require("highlight.js/lib/");
hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
hljs.registerLanguage("json", require("highlight.js/lib/languages/json"));
src/components/jeecg/JEditableTable.vue
+1 -2
View File
@@ -1394,7 +1394,6 @@
},
/** 添加一行 */
add(num = 1, forceScrollToBottom = false) {
console.log(num,'num')
if (num < 1) return
// let timestamp = new Date().getTime()
let rows = this.rows
@@ -2622,7 +2621,7 @@
/** 上传请求地址 */
getUploadAction(value) {
if (!value) {
return window._CONFIG['domianURL'] + '/sys/common/upload'
return process.env.VUE_APP_BASE_API + "/common/upload"
} else {
return value
}
src/components/jeecg/JImageUpload.vue
+1 -1
View File
@@ -43,7 +43,7 @@
name: 'JImageUpload',
data(){
return {
uploadAction:window._CONFIG['domianURL']+"/systemConfig/upload",
uploadAction:process.env.VUE_APP_BASE_API + "/common/upload",
uploadLoading:false,
picUrl:false,
headers:{},
src/components/jeecg/JImportModal.vue
+2 -2
View File
@@ -61,12 +61,12 @@
watch: {
url (val) {
if(val){
this.uploadAction = window._CONFIG['domianURL']+val
this.uploadAction = process.env.VUE_APP_BASE_API+val
}
}
},
created () {
this.uploadAction = window._CONFIG['domianURL']+this.url
this.uploadAction = process.env.VUE_APP_BASE_API+this.url
},
methods:{
src/components/jeecg/JModal/index.vue
+1 -1
View File
@@ -206,7 +206,7 @@
.j-modal-title-row {
.left {
width: calc(100% - 56px - 56px);
width: calc(~"100% - 56px - 56px");
}
.right {
src/components/jeecg/JUpload.vue
+1 -1
View File
@@ -63,7 +63,7 @@
name: 'JUpload',
data(){
return {
uploadAction:window._CONFIG['domianURL']+"/systemConfig/upload",
uploadAction:process.env.VUE_APP_BASE_API + "/common/upload",
headers:{},
fileList: [],
newFileList: [],
src/components/jeecgbiz/modal/SelectUserListModal.vue
+2 -2
View File
@@ -34,8 +34,8 @@
model: {},
confirmLoading: false,
url: {
add: "/act/model/create",
list: "/sys/user/list"
add: "/erp/act/model/create",
list: "/erp/sys/user/list"
},
columns: [
{
src/components/tools/DynamicNotice.vue
+1 -1
View File
@@ -19,7 +19,7 @@
if(!this.path){
return null;
}
return () => import(`@/views/${this.path}.vue`)
return () => Promise.resolve( require(`@/views/${this.path}.vue`).default)
}
},
props: ['path','formData'],
src/main.js
+4
View File
@@ -21,6 +21,9 @@ import JeecgComponents from '@/components/jeecg/index'
// import Viser from 'viser-vue'
import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less'
import '@/assets/less/JAreaLinkage.less'
import VueAreaLinkage from 'vue-area-linkage'
import './assets/icons' // icon
import './permission' // permission control
// import './tongji' // 百度统计
@@ -66,6 +69,7 @@ import DocAlert from '@/components/DocAlert'
import VueMeta from 'vue-meta'
Vue.use(Antd)
Vue.use(VueAreaLinkage);
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
src/mixins/JeecgListMixin.js
+1 -1
View File
@@ -278,7 +278,7 @@ export const JeecgListMixin = {
/* 导出 */
handleExportXls2(){
let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
let url = `${process.env.VUE_APP_BASE_API}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
window.location.href = url;
},
handleExportXls(fileName){
src/store/modules/user.js
+15
View File
@@ -1,5 +1,7 @@
import {login, logout, getInfo, socialLogin, socialLogin2} from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { putAction,postAction,getAction } from '@/api/manage'
import Vue from 'vue'
const user = {
state: {
@@ -44,6 +46,19 @@ const user = {
res = res.data;
setToken(res.token)
commit('SET_TOKEN', res.token)
// 设定进销存参数 尝试同步zsw
let params = {};
params.currentPage = 1;
params.pageSize = 100;
getAction('/erp/materialProperty/list', params).then((mp) => {
console.log(mp);
if(mp && mp.code === 200){
if(mp.data) {
let thisRows = mp.data.rows; //属性列表
Vue.ls.set('materialPropertyList', thisRows);
}
}
})
resolve()
}).catch(error => {
reject(error)
src/utils/util.js
+6 -2
View File
@@ -1,5 +1,6 @@
import api from '@/api/api'
import isURL from '@/utils/validate'
import { re } from 'mathjs'
import XLSX from 'xlsx'
export function timeFix() {
@@ -90,9 +91,9 @@ function generateChildRouters (data) {
let componentPath = "";
item.route = "1";
if(item.component.indexOf("layouts")>=0){
componentPath = () => import('@/components'+item.component);
componentPath = () => Promise.resolve(require('@/components'+item.component).default);
} else {
componentPath = () => import('@/views'+item.component);
componentPath = () => Promise.resolve(require('@/views'+item.component).default)
}
// eslint-disable-next-line
let URL = (item.url|| '').replace(/{{([^}}]+)?}}/g, (s1, s2) => eval(s2)) // URL支持{{ window.xxx }}占位符变量
@@ -447,6 +448,9 @@ export function replaceAll(text, checker, replacer) {
* @returns {string}
*/
export function getMpListShort(thisRows, checker, replacer) {
if (!thisRows){
return "";
}
let mPropertyListShort = ''
let nativeNameStr = ''
for (let i = 0; i < thisRows.length; i++) {
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/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/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
+2 -2
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 () {
@@ -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/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/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/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/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/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
+10 -10
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: {
@@ -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
+5 -5
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"
}
}
},
@@ -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/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
+5 -5
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'
},
}
},
@@ -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
+4 -4
View File
@@ -129,8 +129,8 @@
}
],
url: {
list: "/account/list",
getStatistics: "/account/getStatistics"
list: "/erp/account/list",
getStatistics: "/erp/account/getStatistics"
}
}
},
@@ -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
+3 -3
View File
@@ -186,7 +186,7 @@
{title: '备注', dataIndex: 'newRemark', width: 100}
],
url: {
list: "/depotHead/findAllocationDetail",
list: "/erp/depotHead/findAllocationDetail",
}
}
},
@@ -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
+3 -3
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"
}
}
},
@@ -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
+3 -3
View File
@@ -153,7 +153,7 @@
{title: '单据日期', dataIndex: 'oTime', width: 160}
],
url: {
list: "/depotHead/findStatementAccount",
list: "/erp/depotHead/findStatementAccount",
}
}
},
@@ -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
+3 -3
View File
@@ -178,7 +178,7 @@
{title: '备注', dataIndex: 'newRemark', width: 100}
],
url: {
list: "/depotHead/findInDetail",
list: "/erp/depotHead/findInDetail",
}
}
},
@@ -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
+3 -3
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",
}
}
},
@@ -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
+5 -5
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"
}
}
},
@@ -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
+3 -3
View File
@@ -180,7 +180,7 @@
}
],
url: {
list: "/material/getListWithStock"
list: "/erp/material/getListWithStock"
}
}
},
@@ -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
+3 -3
View File
@@ -178,7 +178,7 @@
{title: '备注', dataIndex: 'newRemark', width: 100}
],
url: {
list: "/depotHead/findInDetail",
list: "/erp/depotHead/findInDetail",
}
}
},
@@ -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
+3 -3
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",
}
}
},
@@ -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
+3 -3
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"
}
}
},
@@ -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
+3 -3
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"
}
}
},
@@ -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
+3 -3
View File
@@ -154,7 +154,7 @@
{title: '单据日期', dataIndex: 'oTime', width: 160}
],
url: {
list: "/depotHead/findStatementAccount",
list: "/erp/depotHead/findStatementAccount",
}
}
},
@@ -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
+2 -2
View File
@@ -131,7 +131,7 @@
{title: '库存', dataIndex: 'stock', width: 80}
],
url: {
list: "/depotItem/batchStock"
list: "/erp/depotItem/batchStock"
}
}
},
@@ -168,6 +168,6 @@
}
}
</script>
<style scoped>
<style lang="less" scoped>
@import '~@assets/less/common.less';
</style>
src/views/erp/report/modules/AccountInOutList.vue
+3 -3
View File
@@ -108,7 +108,7 @@
sm: { span: 16 },
},
url: {
list: "/account/findAccountInOutList"
list: "/erp/account/findAccountInOutList"
}
}
},
@@ -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
+3 -3
View File
@@ -88,7 +88,7 @@
sm: { span: 16 },
},
url: {
list: "/depotItem/findDetailByTypeAndMaterialId"
list: "/erp/depotItem/findDetailByTypeAndMaterialId"
}
}
},
@@ -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
+6 -6
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"
}
}
},
@@ -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
+9 -9
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: {
@@ -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
+6 -6
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"
}
}
},
@@ -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
+5 -5
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"
}
}
},
@@ -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
+5 -5
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"
}
}
},
@@ -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
+3 -3
View File
@@ -151,7 +151,7 @@
offset: 1
},
url: {
list: "/log/list",
list: "/erp/log/list",
}
}
},
@@ -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
+9 -9
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: {
@@ -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/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
+5 -5
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"
}
}
},
@@ -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
+5 -5
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"
},
}
},
@@ -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
+7 -7
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: {
@@ -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
+6 -6
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: {
@@ -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>

Some files were not shown because too many files have changed in this diff Show More