Skip to content

W
wms
Commit 8c356db4 authored by 左玲玲's avatar 左玲玲 😬
Browse files
Options

1416

parent bd0f0279
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 327 deletions
config/routes.js
View file @ 8c356db4
......@@ -174,7 +174,7 @@ export default [
},
{
path: "/platform/rule",
path: "/platform/norule",
name: "编号规则",
component: "./platform/Rule",
},
......
src/components/InitForm/index.jsx
View file @ 8c356db4
......@@ -557,9 +557,6 @@ let InitForm = ({
// formartSubmit(values);
}}
onValuesChange={(changedValues, values) => {
console.log('====================================')
console.log(changedValues)
console.log('====================================')
let newvalue = {};
let linkkey = Object.keys(changedValues)[0];
//联动逻辑
......
src/components/TreeRender/index.jsx
View file @ 8c356db4
......@@ -79,20 +79,17 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
</span>
</Tooltip>
) : (
<Tooltip title={item.title} placement="bottom">
<span style={{ display: "inline-block", maxWidth: maxWidth ?? 88, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{item.title}</span>
</Tooltip>
);
<Tooltip title={item.title} placement="bottom">
<span style={{ display: "inline-block", maxWidth: maxWidth ?? 88, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{item.title}</span>
</Tooltip>
);
const actiontitle = (
<div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
{title}
<div>
{
item.key != "0" && <Divider type='vertical' style={{ margin: "0 6px" }}></Divider>
}
{
item.key != "0" && <Tooltip title="编辑" onClick={(e) => {
item.key && item.key != "0" && <Tooltip title="编辑" onClick={(e) => {
e.stopPropagation();
setsavetitle(null)
if (getPrem("enElectricityMeterType_save", "ifs")) {
......@@ -110,8 +107,9 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
<FormOutlined style={{ color: "#1890ff" }} />
</Tooltip>
}
<Divider type='vertical' style={{ margin: "0 6px" }}></Divider>
{
item.key && <Divider type='vertical' style={{ margin: "0 6px" }}></Divider>
}
<Tooltip title="新增">
<PlusSquareOutlined
disabled={!getPrem("enElectricityMeterType_save", "ifs")}
......@@ -158,10 +156,10 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
</Tooltip>
</Popconfirm>
}
{
{/* {
item.key === "" && <Divider type='vertical' style={{ margin: "0 6px" }}></Divider>
}
{
} */}
{/* {
item.key === "" && <Tooltip title={expandall ? "收起" : "展开"} onClick={(e) => {
e.stopPropagation();
setexpandall(!expandall)
......@@ -169,7 +167,7 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
}}>
{expandall ? <ArrowDownOutlined /> : <ArrowRightOutlined />}
</Tooltip>
}
} */}
</div>
</div>
......@@ -221,7 +219,6 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
if (modal.okText == "修改") {
return new Promise((resolve, reject) => {
if (savetitle) {
console.log(ref1.current);
doFetch({
url: saveurl,
params: {
......@@ -299,7 +296,6 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
defaultExpandAll={true}
expandedKeys={expandedKeys}
onExpand={(expandedKeys) => {
console.log(expandedKeys);
onExpand(expandedKeys)
}}
>
......
src/pages/platform/Rule/fields.js
View file @ 8c356db4
import { bmNoType } from "@/services/platform";
import { bmNoTypeadd } from "@/services/system"
export default {
noTypeId: {
value: null,
type: "select",
title: "单号类型",
name: ["noTypeId"],
required: true,
options: {
database: bmNoType,
params: {},
},
col: { span: 12 },
},
noSunName: {
value: null,
type: "input",
title: "编号子类",
name: ["noSunName"],
required: true,
col: { span: 12 },
},
nrList: {
value: { value: [], other: {} },
type: "diyrule",
title: "规则配置",
name: ["nrList"],
col: { span: 24 },
required: true,
},
};
"noTypeId": {
"value": null,
"type": "select",
"title": "单号类型",
"name": [
"noTypeId"
],
"required": true,
"options": {
database: bmNoTypeadd,
params: {}
},
"col": { span: 24 },
},
"nrList": {
"value": { value: [], other: {} },
"type": "diyrule",
"title": "规则配置",
"name": [
"nrList"
],
"col": { span: 24 },
"required": true
}
}
\ No newline at end of file
src/pages/platform/Rule/index.jsx
View file @ 8c356db4
This diff is collapsed.
src/pages/platform/Sendlist/index.jsx
View file @ 8c356db4
......@@ -33,7 +33,7 @@ let SendList = (props) => {
"title": "推送方式",
"dataIndex": "sendMethodName",
"key": "sendMethodName",
search:false
search: false
},
{
"title": "推送内容",
......@@ -127,23 +127,16 @@ let SendList = (props) => {
actionRef={actionRef}
path="/ngic-base-business/paMsgSendRecord/queryList"
></AutoTable>
<Drawer
<Details
title={details.totalTitle}
closable={true}
visible={details.visible}
onClose={() => { cdetails({ ...details, visible: false }) }}
destroyOnClose={true}
afterVisibleChange={(v) => {
cdetails({
...details,
shown: v
})
}}
width="100%"
className="drawerDetails"
{...details}
>
{details.shown && <Details {...details}></Details>}
</Drawer>
</Details>
</div>
)
}
......
src/pages/platform/Sendset/Formpage.jsx
View file @ 8c356db4
......@@ -7,7 +7,7 @@ import InitForm from '@/components/InitForm';
import { doFetch } from '@/utils/doFetch';
import { tableField } from "./fields";
import moment from "moment";
import { factory, allDepartment, allShop, depart, selectionBoxAll,roleList, currentUserList } from "@/services/system";
import { factorySelect,factory, allDepartment, allShop, depart, selectionBoxAll,roleList, currentUserList } from "@/services/system";
const { TextArea } = Input,
{ Paragraph } = Typography;
......@@ -513,10 +513,10 @@ const Formpage = (props) => {
let database;
switch (val) {
case 2:
database = factory
database = factorySelect
break;
case 3:
database = depart
database = factory
break;
case 4:
database = selectionBoxAll
......
src/pages/system/Store/fieldstore.js
View file @ 8c356db4
......@@ -25,11 +25,12 @@ export default {
},
"description": {
"value": null,
"type": "input",
"type": "textarea",
"title": "描述",
"name": [
"description"
],
"required": true
"required": false,
col:{span:24}
}
};
src/services/system.js
View file @ 8c356db4
......@@ -228,4 +228,20 @@ export async function allSection(params) {
method: 'POST',
data: params,
});
}
//查询全部编号类型下拉框(登录人公司)
export async function bmNoTypeadd(params) {
return request(`/wms/ngic-base-business/bmNoType/querySelect`, {
method: 'POST',
data: params,
});
}
//查询全部编号类型下拉框(登录人公司)
export async function bmNoType(params) {
return request(`/wms/ngic-base-business/bmNoType/queryAllSelect`, {
method: 'POST',
data: params,
});
}
\ 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