前端更改
This commit is contained in:
zhouzy062
parent
7e870bacc7
commit
db5a6079c0
|
|
@ -104,7 +104,7 @@ export default {
|
|||
}).then(() => {
|
||||
this.$store.dispatch('LogOut').then(() => {
|
||||
location.href = '/login';
|
||||
// location.href = '/gl/';
|
||||
// location.href = '/gl/login';
|
||||
})
|
||||
}).catch(() => {});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ router.beforeEach((to, from, next) => {
|
|||
store.dispatch('LogOut').then(() => {
|
||||
Message.error(err)
|
||||
next({ path: '/login' })
|
||||
// next({ path: '/gl/' })
|
||||
// next({ path: '/gl/login' })
|
||||
})
|
||||
})
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ Router.prototype.replace = function push(location) {
|
|||
}
|
||||
|
||||
export default new Router({
|
||||
// base:'/gl/',
|
||||
mode: 'history', // 去掉url中的#
|
||||
scrollBehavior: () => ({ y: 0 }),
|
||||
routes: constantRoutes
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ service.interceptors.response.use(res => {
|
|||
isRelogin.show = false;
|
||||
store.dispatch('LogOut').then(() => {
|
||||
location.href = '/login';
|
||||
// location.href = '/gl/';
|
||||
// location.href = '/gl/login';
|
||||
})
|
||||
}).catch(() => {
|
||||
isRelogin.show = false;
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工程名称" prop="projectId">
|
||||
<el-select v-model="queryParams.projectId" filterable placeholder="请选择工程名称" clearable>
|
||||
<el-form-item label="工程名称" prop="lotId">
|
||||
<el-select v-model="queryParams.lotId" filterable placeholder="请选择工程名称" clearable>
|
||||
<el-option
|
||||
v-for="item in projectList"
|
||||
:key="item.projectId"
|
||||
|
|
@ -30,18 +30,18 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系人姓名" prop="cName">
|
||||
<el-form-item label="联系人姓名" prop="backMan">
|
||||
<el-input maxlength="50"
|
||||
v-model="queryParams.cName"
|
||||
v-model="queryParams.backMan"
|
||||
placeholder="请输入联系人姓名"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系人电话" prop="cPhone">
|
||||
<el-form-item label="联系人电话" prop="backPhone">
|
||||
<el-input
|
||||
v-model="queryParams.cPhone"
|
||||
v-model="queryParams.backPhone"
|
||||
placeholder="请输入联系人电话"
|
||||
clearable maxlength="11"
|
||||
style="width: 240px"
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="完成情况" prop="status">
|
||||
<el-select v-model="queryParams.status" filterable placeholder="请选择工程名称" clearable>
|
||||
<el-select v-model="queryParams.status" filterable placeholder="请选择完成情况" clearable>
|
||||
<el-option
|
||||
v-for="item in statusList"
|
||||
:key="item.id"
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@
|
|||
<el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="计量单位" prop="unitCn"/>
|
||||
<el-table-column label="库存数量" prop="num"/>
|
||||
<el-table-column label="预领数量" align="center" prop="createTime">
|
||||
<el-table-column label="预领数量" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model.number="scope.row.preNum"
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="createTime">
|
||||
<el-table-column label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input maxlength="100"
|
||||
v-model="scope.row.remark"
|
||||
|
|
|
|||
|
|
@ -79,12 +79,11 @@
|
|||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="handle(scope.row)"
|
||||
></el-button>
|
||||
@click="handleView(scope.row)"
|
||||
>查看</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="warning"
|
||||
type="primary"
|
||||
@click="handleOut(scope.row)"
|
||||
>出库</el-button>
|
||||
</template>
|
||||
|
|
@ -352,6 +351,11 @@
|
|||
})
|
||||
});
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 查询列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
|
@ -361,6 +365,9 @@
|
|||
this.loading = false;
|
||||
}
|
||||
);
|
||||
},
|
||||
handleView(){
|
||||
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
|
|
@ -379,11 +386,7 @@
|
|||
};
|
||||
this.resetForm("nform");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
handleDialogQuery() {
|
||||
this.dialogQuery.pageNum = 1;
|
||||
this.getDialogList();
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@ module.exports = {
|
|||
// target: `http://192.168.0.14:21624`,//线上环境/
|
||||
// target: `http://1.12.248.179:23028`,//线上环境-南网
|
||||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// target: `https://z.csgmall.com.cn`,
|
||||
target: `https://z.csgmall.com.cn`,
|
||||
|
||||
target: `http://10.40.92.8:8080`,//超
|
||||
// target: `http://10.40.92.8:8080`,//超
|
||||
// target: `http://10.40.92.253:8080`,//韩
|
||||
// target: `http://10.40.92.209:8080`,//川/
|
||||
|
||||
|
|
@ -51,8 +51,9 @@ module.exports = {
|
|||
//更改 utils/globalUrl.js 内qrUrl地址
|
||||
//2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0;
|
||||
//3.只有南网项目产线gl发布打包时候需要注意：
|
||||
// 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
|
||||
//4. 重庆环境的时候需要将新增领料申请跳转地址改为claimAndRefund/receive/receiveApplyAddByCq
|
||||
// 将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';
|
||||
// 登录跳转地址从/login换成/gl/login;
|
||||
//4. 重庆环境的时候需要将领料管理线上菜单修改
|
||||
//******** 注意事项 ********* */
|
||||
|
||||
changeOrigin: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue