Skip to content

W
wms
Commit 5939a3b5 authored by krysent's avatar krysent
Browse files
Options

new

parent e2e36256
Expand all Show whitespace changes
Inline Side-by-side
Showing with 682 additions and 85 deletions
config/proxy.js
View file @ 5939a3b5
......@@ -12,8 +12,8 @@ export default {
"/srwms/": {
// 要代理的地址
// target: "http://192.168.40.18/wms/", //39:28040 18/wms/
// target: "http://192.168.40.203:28040", //39:28040 18/wms/ dj
target: "http://192.168.40.117:28040", //39:28040 18/wms/ dj
target: "http://192.168.40.203:28040", //39:28040 18/wms/ dj
// target: "http://192.168.40.117:28040", //39:28040 18/wms/ jf
changeOrigin: true,
pathRewrite: {
"^/srwms": "",
......
config/routes.js
View file @ 5939a3b5
......@@ -216,6 +216,11 @@ export default [
name: '客户管理',
component: './platform/Custom',
},
{
path: '/store/reservoir',
name: '库区库位',
component: './platform/Reservoir',
},
{
component: "./404",
},
......
src/pages/platform/Reservoir/fields.js 0 → 100644
View file @ 5939a3b5
export default {
"customerNo": {
"value": null,
"type": "input",
"title": "编号",
"name": [
"customerNo"
],
"required": false
},
"customerName": {
"value": null,
"type": "input",
"title": "名称",
"name": [
"customerName"
],
"required": true
},
"officialWebsite": {
"value": null,
"type": "input",
"title": "公司官网",
"name": [
"officialWebsite"
],
"required": false
},
"telephone": {
"value": null,
"type": "input",
"title": "联系电话",
"name": [
"telephone"
],
"required": false
},
"email": {
"value": null,
"type": "input",
"title": "公司邮箱",
"name": [
"email"
],
"required": false
},
"address": {
"value": null,
"type": "input",
"title": "地址",
"name": [
"address"
],
"required": false
},
"score": {
"value": null,
"type": "rate",
"title": "评分",
"name": [
"score"
],
"required": false,
allowHalf: true,
},
"status": {
"value": 1,
"type": "select",
"title": "启停状态",
"name": [
"status"
],
"required": true,
options: [
{
label: "启用",
value: 1
},
{
label: "停用",
value: 0
},
]
},
"remark": {
"value": null,
"type": "textarea",
"title": "备注",
"name": [
"remark"
],
"required": false,
col: { span: 24 }
},
"customerUserList": {
"value": null,
"editable": true,
"type": "table",
"title": "联系人",
"name": [
"customerUserList"
],
"required": false,
"columns": [
{
"title": "联系人姓名",
"dataIndex": "userName",
"key": "userName",
"search": false,
"valueType": "input",
formItemProps: {
rules: [
{
required: true,
message: '此项为必填项',
},
],
}
},
{
"title": "联系电话",
"dataIndex": "telephone",
"key": "telephone",
"search": false,
"valueType": "input",
formItemProps: {
rules: [
{
required: false,
pattern: /^(((\d{3,4}-)?[0-9]{7,8})|(1(3|4|5|6|7|8|9)\d{9}))$/,
message: '手机号格式不正确'
},
],
}
},
{
"title": "邮箱",
"dataIndex": "email",
"key": "email",
"search": false,
"valueType": "input",
formItemProps: {
rules: [
{
required: false,
pattern: /^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\.)+[a-z]{2,}$/,
message: '邮箱格式不正确'
},
],
}
},
{
"title": "职位",
"dataIndex": "title",
"key": "title",
"search": false,
"valueType": "input"
},
{
title: '操作',
valueType: 'option',
render: () => {
return null;
},
},
],
"editable": true,
"rowKey": "id",
"rowName": "",
"dataSource": [],
col: { span: 24 }
}
}
\ No newline at end of file
src/pages/platform/Reservoir/index.jsx 0 → 100644
View file @ 5939a3b5
This diff is collapsed.
src/pages/system/Jiagou/index.jsx
View file @ 5939a3b5
......@@ -119,7 +119,7 @@ const Jiagou = (props) => {
function extraAction(text, record, _, action) {
let ifs = record.children;
return [
getPrem("sysDepartment_save", action, "新增", () => {
getPrem("sysDepartment_save", action, "新增下级", () => {
for (let i in defaultFields) {
defaultFields[i].value = null;
}
......
src/services/login.js
View file @ 5939a3b5
......@@ -43,7 +43,7 @@ export async function getMenu(params) {
/*---------------菜单收藏-------------------*/
export async function collectPerms(params) {
return request(`/wms/ngic-auth/sysUserPermission/collectPerm`, {
return request(`/srwms/ngic-auth/sysUserPermission/collectPerm`, {
method: "POST",
data: params,
});
......@@ -51,14 +51,14 @@ export async function collectPerms(params) {
/*---------------取消菜单收藏-------------------*/
export async function cancelCollectPerms(params) {
return request(`/wms/ngic-auth/sysUserPermission/cancelCollectPerm`, {
return request(`/srwms/ngic-auth/sysUserPermission/cancelCollectPerm`, {
method: "POST",
data: params,
});
}
/*---------------菜单历史记录-------------------*/
export async function mtosave(params) {
return request(`/wms/ngic-auth/sysUserVisitPermission/save`, {
return request(`/srwms/ngic-auth/sysUserVisitPermission/save`, {
method: "POST",
data: params,
});
......
src/services/system.js
View file @ 5939a3b5
......@@ -2,21 +2,21 @@ import request from "@/utils/request";
//工厂下拉框
export async function factorySelect(params) {
return request(`/wms/ngic-auth/sysFactory/selectionBox`, {
return request(`/srwms/ngic-auth/sysFactory/selectionBox`, {
method: "POST",
data: params,
});
}
//查询个人所属工厂下拉框
export async function factorySelectByuser(params) {
return request(`/wms/ngic-auth/sysFactory/selectionBoxU`, {
return request(`/srwms/ngic-auth/sysFactory/selectionBoxU`, {
method: "POST",
data: params,
});
}
//查询工厂下拉框---注册
export async function factorySelectRegister(params) {
return request(`/wms/ngic-auth/sysFactory/selectionBoxAll`, {
return request(`/srwms/ngic-auth/sysFactory/selectionBoxAll`, {
method: "POST",
data: params,
});
......@@ -24,28 +24,28 @@ export async function factorySelectRegister(params) {
//全部车间下拉框
export async function shopSelect(params) {
return request(`/wms/ngic-auth/sysShop/selectionBox`, {
return request(`/srwms/ngic-auth/sysShop/selectionBox`, {
method: "POST",
data: params,
});
}
//仓库下拉
export async function storeselectionBoxAll(params) {
return request(`/wms/ngic-auth/sysStore/selectionBox`, {
return request(`/srwms/ngic-auth/sysStore/selectionBox`, {
method: "POST",
data: params,
});
}
//根据工厂id查询车间下拉
export async function storeselectionBox(params) {
return request(`/wms/ngic-auth/sysStore/selectionBox`, {
return request(`/srwms/ngic-auth/sysStore/selectionBox`, {
method: "POST",
data: params,
});
}
//全部组织下拉
export async function allDepartment(params) {
return request(`/wms/ngic-auth/sysDepartment/query/selectbox/depart`, {
return request(`/srwms/ngic-auth/sysDepartment/query/selectbox/depart`, {
method: 'POST',
data: params,
});
......@@ -53,77 +53,77 @@ export async function allDepartment(params) {
//根据工厂id查询车间下拉
export async function shopSelectByFactory(params) {
return request(`/wms/ngic-auth/sysShop/query/selectbox/factory`, {
return request(`/srwms/ngic-auth/sysShop/query/selectbox/factory`, {
method: "POST",
data: params,
});
}
//根据车间id查询产线下拉
export async function productionLineSelectByShop(params) {
return request(`/wms/ngic-auth/sysProductionLine/query/selectbox/shopId`, {
return request(`/srwms/ngic-auth/sysProductionLine/query/selectbox/shopId`, {
method: "POST",
data: params,
});
}
//根据车间id集合查询产线下拉
export async function productionLineSelectByShops(params) {
return request(`/wms/ngic-auth/sysProductionLine/query/selectbox/shopIds`, {
return request(`/srwms/ngic-auth/sysProductionLine/query/selectbox/shopIds`, {
method: "POST",
data: params,
});
}
//根据车间id查询工段下拉
export async function sectionSelectByShop(params) {
return request(`/wms/ngic-auth/sysSection/query/selectbox/shopId`, {
return request(`/srwms/ngic-auth/sysSection/query/selectbox/shopId`, {
method: "POST",
data: params,
});
}
//根据车间id集合查询工段下拉
export async function sectionSelectByShops(params) {
return request(`/wms/ngic-auth/sysSection/query/selectbox/shopIds`, {
return request(`/srwms/ngic-auth/sysSection/query/selectbox/shopIds`, {
method: "POST",
data: params,
});
}
//授权前查询权限树
export async function roleTree(params) {
return request(`/wms/ngic-auth/sysRolePermission/queryAll`, {
return request(`/srwms/ngic-auth/sysRolePermission/queryAll`, {
method: "POST",
data: params,
});
}
//角色下权限数据
export async function adminDataqueryAll(params) {
return request(`/wms/ngic-auth/sysRoleDataPermission/queryAll`, {
return request(`/srwms/ngic-auth/sysRoleDataPermission/queryAll`, {
method: "POST",
data: params,
});
}
//不包含自己在内的全部用户下拉框
export async function userSelect(params) {
return request(`/wms/ngic-auth/sysUser/queryParentSelectionByUserId`, {
return request(`/srwms/ngic-auth/sysUser/queryParentSelectionByUserId`, {
method: "POST",
data: params,
});
}
//全部用户下拉框
export async function allUserSelect(params) {
return request(`/wms/ngic-auth/sysUser/query/selectbox/company`, {
return request(`/srwms/ngic-auth/sysUser/query/selectbox/company`, {
method: "POST",
data: params,
});
}
//根据工厂id查询树结构
export async function departmentTree(params) {
return request(`/wms/ngic-auth/sysDepartment/query/tree`, {
return request(`/srwms/ngic-auth/sysDepartment/query/tree`, {
method: "POST",
data: params,
});
}
//查询角色下拉框
export async function roleSelect(params) {
return request(`/wms/ngic-auth/sysRole/queryAllSelectList`, {
return request(`/srwms/ngic-auth/sysRole/queryAllSelectList`, {
method: "POST",
data: params,
});
......@@ -131,14 +131,14 @@ export async function roleSelect(params) {
//查询角色下拉框---注册
export async function roleSelectRegister(params) {
return request(`/wms/ngic-auth/sysRole/queryAllSelectByComId`, {
return request(`/srwms/ngic-auth/sysRole/queryAllSelectByComId`, {
method: "POST",
data: params,
});
}
//查询全部编号类型下拉框(登录人公司)
export async function bmNoRule(params) {
return request(`/wms/ngic-base-business/bmNoRule/querySelect`, {
return request(`/srwms/ngic-base-business/bmNoRule/querySelect`, {
method: "POST",
data: params,
});
......@@ -146,7 +146,7 @@ export async function bmNoRule(params) {
//根据物料查询产线下拉框
export async function productionLineSelectByMaterieId(params) {
return request(`/wms/ngic-auth/sysProductionLine/query/selectbox/materieId`, {
return request(`/srwms/ngic-auth/sysProductionLine/query/selectbox/materieId`, {
method: "POST",
data: params,
});
......@@ -154,7 +154,7 @@ export async function productionLineSelectByMaterieId(params) {
//根据物料查询班组下拉框
export async function groupSelectByMaterieId(params) {
return request(`/wms/ngic-auth/sysGroup/query/selectbox/materieId`, {
return request(`/srwms/ngic-auth/sysGroup/query/selectbox/materieId`, {
method: "POST",
data: params,
});
......@@ -162,7 +162,7 @@ export async function groupSelectByMaterieId(params) {
//根据物料查询班次下拉框
export async function shiftSelectByMaterieId(params) {
return request(`/wms/ngic-auth/sysShift/query/selectbox/materieId`, {
return request(`/srwms/ngic-auth/sysShift/query/selectbox/materieId`, {
method: "POST",
data: params,
});
......@@ -170,21 +170,21 @@ export async function shiftSelectByMaterieId(params) {
//根据车间id查询班次下拉框
export async function shiftSelectByShopId(params) {
return request(`/wms/ngic-auth/sysShift/query/selectbox/shopId`, {
return request(`/srwms/ngic-auth/sysShift/query/selectbox/shopId`, {
method: "POST",
data: params,
});
}
//角色下拉框
export async function roleList(params) {
return request(`/wms/ngic-auth/sysRole/queryAllSelectList`, {
return request(`/srwms/ngic-auth/sysRole/queryAllSelectList`, {
method: 'POST',
data: params,
});
}
//集团下拉框
export async function factory(params) {
return request(`/wms/ngic-auth/sysDepartment/query/selectbox/factory`, {
return request(`/srwms/ngic-auth/sysDepartment/query/selectbox/factory`, {
method: 'POST',
data: params,
});
......@@ -193,21 +193,21 @@ export async function factory(params) {
// 4 ：
//集团下拉框
export async function zuzhi(params) {
return request(`/wms/ngic-auth/sysDepartment/query/tree`, {
return request(`/srwms/ngic-auth/sysDepartment/query/tree`, {
method: 'POST',
data: params,
});
}
//集团下拉框
export async function depart(params) {
return request(`/wms/ngic-auth/sysDepartment/query/selectbox/depart`, {
return request(`/srwms/ngic-auth/sysDepartment/query/selectbox/depart`, {
method: 'POST',
data: params,
});
}
//集团下拉框
export async function selectionBoxAll(params) {
return request(`/wms/ngic-auth/sysStore/selectionBoxAll`, {
return request(`/srwms/ngic-auth/sysStore/selectionBoxAll`, {
method: 'POST',
data: params,
});
......@@ -216,21 +216,21 @@ export async function selectionBoxAll(params) {
//下拉框---当前公司下
export async function currentUserList(params) {
return request(`/wms/ngic-auth/sysUser/query/selectbox/current/company`, {
return request(`/srwms/ngic-auth/sysUser/query/selectbox/current/company`, {
method: 'POST',
data: params,
});
}
//当前公司所有工厂下拉
export async function allShop(params) {
return request(`/wms/ngic-auth/sysShop/query/selectbox/current/company`, {
return request(`/srwms/ngic-auth/sysShop/query/selectbox/current/company`, {
method: 'POST',
data: params,
});
}
//当前公司所有车间下拉
export async function allSection(params) {
return request(`/wms/ngic-auth/sysSection/query/selectbox`, {
return request(`/srwms/ngic-auth/sysSection/query/selectbox`, {
method: 'POST',
data: params,
});
......@@ -238,7 +238,7 @@ export async function allSection(params) {
//查询全部编号类型下拉框(登录人公司)
export async function bmNoTypeadd(params) {
return request(`/wms/ngic-base-business/bmNoType/querySelect`, {
return request(`/srwms/ngic-base-business/bmNoType/querySelect`, {
method: 'POST',
data: params,
});
......@@ -246,7 +246,7 @@ export async function bmNoTypeadd(params) {
//查询全部编号类型下拉框(登录人公司)
export async function bmNoType(params) {
return request(`/wms/ngic-base-business/bmNoType/queryAllSelect`, {
return request(`/srwms/ngic-base-business/bmNoType/queryAllSelect`, {
method: 'POST',
data: params,
});
......
src/utils/doFetch.js
View file @ 5939a3b5
......@@ -11,7 +11,7 @@ export async function doFetch({ url, params }) {
if(!url){
return
}
return request("/wms" + url, {
return request("/srwms" + url, {
method: "POST",
data: params,
});
......
src/utils/mymodelhtml.js
View file @ 5939a3b5
import src from "../../public/ewm.png";
export const str = `<table
border="1"
width="100%"
height="100%"
style="border-collapse: collapse; border: solid 1px"
bordercolor="#000000"
cellpadding="0"
>
<tr>
<td colspan="8">卷料名称：剪切后硅钢片</td>
</tr>
<tr>
<td colspan="8">卷料编码：PDC010100093</td>
</tr>
<tr>
<td colspan="4">牌号：070片</td>
<td colspan="4">母卷编号：20SQC</td>
</tr>
<tr>
<td colspan="4">厂家：江苏南高</td>
<td colspan="4">母卷重量：100KG</td>
</tr>
<tr>
<td colspan="8">单边卷料厚度：200mm</td>
</tr>
<tr>
<td colspan="2" rowspan="3">
<img src=${src} style="width:50px"/>
</td>
<td colspan="3">铁损：0.68w/kg</td>
<td colspan="3">批次：20230412</td>
</tr>
<tr>
<td colspan="3">宽度：188mm</td>
<td colspan="3">片厚：0.2mm</td>
</tr>
<tr>
<td colspan="3">重量：631KG</td>
<td colspan="3">米数：2292M</td>
</tr>
<tr>
<td colspan="8">条码：1BR157846039401296</td>
</tr>
</table>`;
import srcc from "../../public/1.png";
// export const str = `<table
// border="1"
// width="100%"
// height="100%"
// style="border-collapse: collapse; border: solid 1px"
// bordercolor="#000000"
// cellpadding="0"
// >
// <tr>
// <td colspan="8">卷料名称：剪切后硅钢片</td>
// </tr>
// <tr>
// <td colspan="8">卷料编码：PDC010100093</td>
// </tr>
// <tr>
// <td colspan="4">牌号：070片</td>
// <td colspan="4">母卷编号：20SQC</td>
// </tr>
// <tr>
// <td colspan="4">厂家：江苏南高</td>
// <td colspan="4">母卷重量：100KG</td>
// </tr>
// <tr>
// <td colspan="8">单边卷料厚度：200mm</td>
// </tr>
// <tr>
// <td colspan="2" rowspan="3">
// <img src=${src} style="width:50px"/>
// </td>
// <td colspan="3">铁损：0.68w/kg</td>
// <td colspan="3">批次：20230412</td>
// </tr>
// <tr>
// <td colspan="3">宽度：188mm</td>
// <td colspan="3">片厚：0.2mm</td>
// </tr>
// <tr>
// <td colspan="3">重量：631KG</td>
// <td colspan="3">米数：2292M</td>
// </tr>
// <tr>
// <td colspan="8">条码：1BR157846039401296</td>
// </tr>
// </table>`;
export const str = `<img src=${srcc}/>`
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment