Commit 1857523c authored by wuhao's avatar wuhao 🎯

asder

parent f5342041
...@@ -53,7 +53,7 @@ function Table({ route }) { ...@@ -53,7 +53,7 @@ function Table({ route }) {
"search": false "search": false
}, },
{ {
"title": "部门名称", "title": "组织名称",
"dataIndex": "departmentName", "dataIndex": "departmentName",
"key": "departmentName" "key": "departmentName"
}, },
......
...@@ -52,7 +52,7 @@ const addFields = { ...@@ -52,7 +52,7 @@ const addFields = {
"value": 2 "value": 2
}, },
{ {
"label": "部门", "label": "组织",
"value": 3 "value": 3
}, },
{ {
......
...@@ -237,7 +237,7 @@ const Pushdeploy = (props) => { ...@@ -237,7 +237,7 @@ const Pushdeploy = (props) => {
"value": 2 "value": 2
}, },
{ {
"label": "部门", "label": "组织",
"value": 3 "value": 3
}, },
{ {
......
...@@ -185,7 +185,7 @@ const Shiftgroup = (props) => { ...@@ -185,7 +185,7 @@ const Shiftgroup = (props) => {
key: "userName", key: "userName",
}, },
{ {
title: "部门", title: "组织",
dataIndex: "departmentName", dataIndex: "departmentName",
key: "departmentName", key: "departmentName",
search: false, search: false,
...@@ -217,7 +217,7 @@ const Shiftgroup = (props) => { ...@@ -217,7 +217,7 @@ const Shiftgroup = (props) => {
search: false, search: false,
}, },
{ {
title: "部门", title: "组织",
dataIndex: "departmentName", dataIndex: "departmentName",
key: "departmentName", key: "departmentName",
search: false, search: false,
......
...@@ -150,7 +150,7 @@ const Charactor = (props) => { ...@@ -150,7 +150,7 @@ const Charactor = (props) => {
key: "factoryName", key: "factoryName",
}, },
{ {
title: "部门", title: "组织",
dataIndex: "departmentName", dataIndex: "departmentName",
key: "departmentName", key: "departmentName",
}, },
......
...@@ -34,7 +34,7 @@ function reducer(state, action) { ...@@ -34,7 +34,7 @@ function reducer(state, action) {
...state, ...state,
vs: true, vs: true,
iftype: { iftype: {
title: `新增 ${action.curitem.title} 下的部门`, title: `新增 ${action.curitem.title} 下的组织`,
val: type, val: type,
}, },
fields: { ...action.fields }, fields: { ...action.fields },
...@@ -96,7 +96,7 @@ const Jiagou = (props) => { ...@@ -96,7 +96,7 @@ const Jiagou = (props) => {
dataIndex: "departmentType", dataIndex: "departmentType",
key: "departmentType", key: "departmentType",
render: (text, record) => ( render: (text, record) => (
<span>{record.departmentType == 0 ? "集团类型" : "部门类型"}</span> <span>{record.departmentType == 0 ? "集团类型" : "组织类型"}</span>
), ),
search: false, search: false,
}, },
......
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
departmentId: { departmentId: {
value: null, value: null,
type: "treeselect", type: "treeselect",
title: "部门", title: "组织",
name: ["departmentId"], name: ["departmentId"],
required: true, required: true,
options: { options: {
......
...@@ -216,7 +216,7 @@ const Login = () => { ...@@ -216,7 +216,7 @@ const Login = () => {
"key": "auditResultName" "key": "auditResultName"
}, },
{ {
"title": "这是审批意见", "title": "审批意见",
"dataIndex": "auditOpinion", "dataIndex": "auditOpinion",
"key": "auditOpinion" "key": "auditOpinion"
}, },
...@@ -410,8 +410,8 @@ const Login = () => { ...@@ -410,8 +410,8 @@ const Login = () => {
<Col span={8}> <Col span={8}>
<ProFormTreeSelect <ProFormTreeSelect
name="departmentId" name="departmentId"
label={<b>部门</b>} label={<b>组织</b>}
placeholder="请选择部门" placeholder="请选择组织"
fieldProps={{ fieldProps={{
fieldNames: { fieldNames: {
label: "title", label: "title",
...@@ -426,7 +426,7 @@ const Login = () => { ...@@ -426,7 +426,7 @@ const Login = () => {
rules={[ rules={[
{ {
required: true, required: true,
message: "请选择部门!", message: "请选择组织!",
} }
]} ]}
/> />
......
...@@ -43,7 +43,7 @@ export async function storeselectionBox(params) { ...@@ -43,7 +43,7 @@ export async function storeselectionBox(params) {
data: params, data: params,
}); });
} }
//全部部门下拉 //全部组织下拉
export async function allDepartment(params) { export async function allDepartment(params) {
return request(`/wms/ngic-auth/sysDepartment/query/selectbox/depart`, { return request(`/wms/ngic-auth/sysDepartment/query/selectbox/depart`, {
method: 'POST', method: 'POST',
......
...@@ -232,7 +232,7 @@ const userDetails = [ ...@@ -232,7 +232,7 @@ const userDetails = [
key: "factoryName", key: "factoryName",
}, },
{ {
title: "部门", title: "组织",
key: "departmentName", key: "departmentName",
}, },
{ {
...@@ -365,7 +365,7 @@ const userCheckDetails = [ ...@@ -365,7 +365,7 @@ const userCheckDetails = [
key: "factoryName", key: "factoryName",
}, },
{ {
title: "部门", title: "组织",
key: "departmentName", key: "departmentName",
}, },
{ {
...@@ -712,7 +712,7 @@ const shiftgroupDetail = [ ...@@ -712,7 +712,7 @@ const shiftgroupDetail = [
search: false, search: false,
}, },
{ {
title: "部门", title: "组织",
dataIndex: "departmentName", dataIndex: "departmentName",
key: "departmentName", key: "departmentName",
search: false, search: false,
......
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