Commit 0c43ee42 authored by XieZhiXiong's avatar XieZhiXiong
parents 54b67ebf 957a1049
......@@ -216,6 +216,15 @@
margin: 16px 16px 0;
}
// 覆写 card padding
.ant-card-head {
padding: 0 16px;
}
.ant-card-body {
padding: 16px;
}
}
.ant-descriptions-item-label {
......
......@@ -416,8 +416,15 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
id: attributeObjArr[_index].customerAttributeId,
name: attributeObjArr[_index].attributeName
}
console.log(attributeValObjArr, item, index, _item, _index, _tableDataSource, '调试属性')
_tempObject.customerAttributeValue = {
id: attributeValObjArr.map(__item => __item.find(_ => _.value===_item)).filter(__ => __)[0].id,
// @fixed bug: 属性名称相同的情况下 只找第一个元素 会出现id异常
// id: attributeValObjArr.map(__item => __item.find(_ => _.value===_item)).filter(__ => __)[0].id,
id: attributeValObjArr.map((__item, __index) => {
if(_index === __index) {
return __item.find(_ => _.value===_item)
}
}).filter(__ => __)[0].id,
value: item[_index]
}
_tempArr.push(_tempObject)
......
......@@ -80,6 +80,8 @@ enum SourceEnum {
product = 2,
}
const innerStatusFail = 9; // 内部状态审核不通过时, 单据审核默认不通过
const Detail: React.FC<{}> = () => {
const pathname = history.location.pathname;
......@@ -246,7 +248,7 @@ const Detail: React.FC<{}> = () => {
const renderExtra = () => {
const ExamineComponent = (
<ExamineModal onOk={examOnOk} modalType={"basic"}>
<ExamineModal onOk={examOnOk} modalType={"basic"} defaultChecked={info?.innerStatus === innerStatusFail ? 0 : 1}>
<Button loading={loading} type="primary" >单据审核</Button>
</ExamineModal>
)
......
......@@ -189,7 +189,7 @@ const processStock: React.FC<{}> = () => {
),
[OuterAndInnerStatus.pending_add_logistics]: <Link to={`${ADD_LOGISTICS_PATH}?createType=3&id=${record.id}`}>新增物流单</Link>,
[OuterAndInnerStatus.pending_confirm_logistics]: <Link to={`${DETAIL_LOGISTICS_PATH}?id=${record.logisticsOrderId}`}>查看物流单</Link>,
[OuterAndInnerStatus.editing_logistics]: <Link to={`memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/edit?id=${record.logisticsOrderId}`}></Link>,
[OuterAndInnerStatus.editing_logistics]: <Link to={`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/edit?id=${record.logisticsOrderId}`}>编辑</Link>,
[OuterAndInnerStatus.pending_confirm_deliver]: <Link to={`${PENDING_DELIVERD_PATH}/detail?id=${record.id}`}>发货</Link>,
[OuterAndInnerStatus.pending_add_process_in_warehouse]: (
<Link
......@@ -215,7 +215,7 @@ const processStock: React.FC<{}> = () => {
[OuterAndInnerStatus.pending_confirm_receive]: <Link to={`${ASSIGN_PENDING_RECEIVE}/detail?id=${record.id}`}>收货</Link>,
[OuterAndInnerStatus.pending_confirm_receipt]: <Link to={`${PENDING_RECEIPT_PATH}/detail?id=${record.id}`}>确认回单</Link>
}
return MAP[`${outerStatus}_${innerStatus}`]
return MAP[`${outerStatus}_${innerStatus}`];
}
}
]
......
......@@ -26,9 +26,7 @@ interface Iprops {
}
const DeliveryInfomation: React.FC<Iprops> = (props) => {
console.log(props);
const manualDeliverInfo = props.manualDeliver && props.manualDeliver.deliveryAddress?.split("/");
console.log(manualDeliverInfo)
return (
<Card title="交付信息">
<Row>
......
......@@ -22,12 +22,13 @@ enum ImodalType {
interface Iprops {
onOk?: (params: Iparams) => void,
modalType: string
modalType: string,
defaultChecked: number
}
const ExamineModal: React.FC<Iprops> = (props) => {
const [visible, setVisible] = useState<boolean>(false);
const [status, setStatus] = useState<number>(1);
const [status, setStatus] = useState<number>(props.defaultChecked);
const [text, setText] = useState("");
const [receiveAddress, setReceiveAddress] = useState([]);
const [activeAddress, setActiveAddress] = useState<number>(null);
......@@ -72,19 +73,16 @@ const ExamineModal: React.FC<Iprops> = (props) => {
pageSize: '15'
}).then(({ data, code }) => {
if(code === 1000) {
// const temp = data.data.map((item) => {
// return {
// label: item.fullAddress + " / " + item.receiverName + " / " + item.phone,item.fullAddress + " / " + item.receiverName + " / " + item.phone,
// value: item.id,
// otherMsg: item,
// }
// })
setReceiveAddress(data.data)
}
})
}
}, [props.modalType])
useEffect(() => {
setStatus(props.defaultChecked)
}, [props.defaultChecked])
const handleSelectChange = (value) => {
setActiveAddress(value)
}
......@@ -95,8 +93,6 @@ const ExamineModal: React.FC<Iprops> = (props) => {
{
props.children
}
{/* <Button type="primary" >单据审核</Button> */}
</div>
<Modal
visible={visible}
......@@ -118,7 +114,7 @@ const ExamineModal: React.FC<Iprops> = (props) => {
</Select>
</div>
<Radio.Group onChange={onChange} value={status}>
<Radio value={1}>审核通过</Radio>
<Radio value={1} disabled={props.defaultChecked === 0}>审核通过</Radio>
<Radio value={0}>审核不通过</Radio>
</Radio.Group>
<div style={status === 1 ? {display: 'none'} : {}}>
......
......@@ -76,10 +76,10 @@ const LogisticsCenter: React.FC<Iprops> = () => {
<div className={styles.centerRow}>
{
data.map((item) => {
const hasAuth = !urls.includes(item.url);
if(!hasAuth) {
return null
}
// const hasAuth = !urls.includes(item.url);
// if(!hasAuth) {
// return null
// }
return (
<Link key={item.text} to={item.url} className={styles.tagsItem}>
<div className={styles.icon}>
......
......@@ -15,6 +15,7 @@ import { useLinkageUtils } from '@/utils/formEffectUtils';
import { PublicApi } from '@/services/api';
import { GetMemberAbilitySubGetResponse } from '@/services/MemberApi';
import { initDetailSchema } from './schema';
import { getAuth } from '@/utils/auth';
const formActions = createFormActions();
const {
......@@ -164,7 +165,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
useEffect(() => {
if (mode === "myself") {
formActions.setFieldState('tabs.tab-1.*', state => {
formActions.setFieldState('tabs.tab-1.MEGA_LAYOUT1.*(memberTypeId, MEGA_LAYOUT1_1.*, roleId, level)', state => {
state.editable = false;
});
}
......@@ -267,11 +268,20 @@ const MemberForm: React.FC<MemberFormProps> = ({
duration: 0,
});
PublicApi.postMemberMainpageDetailUpdate({
email,
detail: rest,
}).then(({ data, code }) => {
if (code !== 1000) {
return;
}
const auth = getAuth();
localStorage.setItem("auth", JSON.stringify({
...auth,
validateMsg: null,
validateStatus: 1,
validateStatusDesc: "待审核"
}))
setUnsaved(false);
setTimeout(() => {
history.push('/memberCenter/home')
......
......@@ -4,7 +4,6 @@ import MemberForm from './components/MemberForm';
const EditMySelf: React.FC = () => {
const { id, validateId } = usePageStatus();
console.log(123);
return (
<MemberForm id={+id} validateId={+validateId} isEdit={true} mode={"myself"} />
......
......@@ -101,10 +101,10 @@ export const tableListSchema: ISchema = {
placeholder: '请输入订单摘要',
}
},
"supplyMembersName": {
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
placeholder: '请输入采购会员名称'
}
},
"type": {
......
......@@ -33,6 +33,7 @@ const OrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
if(type === 'saleOrder') {
params.contractName = data.electronicContractName
params.contractUrl = data.electronicContractUrl
params.memberId = data.createMemberId
} else {
params.signatureLogId = data.signatureLogId
// params.id = parseInt(data.id)
......
......@@ -40,7 +40,13 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
// @bug todo 编辑情况下 默认显示有问题 固定第一个
// console.log(value, mode, dataSource, 'EDIT')
if(typeof value === 'object') {
let target = (mode === 'add' || mode === 'delete') ? dataSource[0] : value
// let target = (mode === 'add' || mode === 'delete') ? dataSource[0] : value
let target = value;
if(mode === 'add' || mode === 'delete') {
target = dataSource[0]
} else if(mode === 'edit') {
target = dataSource.find(v => v.id === value.id)
}
setFieldState({
dataSource,
showMore,
......@@ -90,16 +96,17 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
form.setFieldValue("needTheInvoice", 0)
}
// 订单新增 重载全部置为第一个
let _data = data.sort((a, b) => b.id - a.id)
if(pageStatus === PageStatus.ADD) {
setFieldState({
dataSource: data,
dataSource: _data,
showMore,
useValue: data[0],
useValue: _data[0],
})
mutators.change(data[0])
mutators.change(_data[0])
} else if(pageStatus === PageStatus.EDIT) {
setFieldState({
dataSource: data,
dataSource: _data,
showMore,
useValue,
})
......
......@@ -287,23 +287,27 @@ export const useOrderUpdateChangeOther = (ctx: ISchemaFormActions | ISchemaFormA
FormEffectHooks.onFieldValueChange$('theInvoiceId').subscribe(state => {
const { value, path } = state
// console.log(state, '发票之前')
if(pageStatus === PageStatus.EDIT){
if(state?.dataSource?.length && state.loading) {
if(state?.dataSource?.length && state.loading && state.props["x-component-props"].times > 2) {
ctx.submit((values) => {
// console.log(values, value, path, '发票id')
// console.log(values, value, path, state, '发票id')
if(values){
PublicApi.postOrderProcurementOrderUpdate({
...values,
deliveryTime: moment(values.deliveryTime).valueOf(),
theInvoiceId: value.id,
// needTheInvoice: Number(values.needTheInvoice),
needTheInvoice: Number(values.needTheInvoice),
deliveryAddresId: values.deliveryAddresId,
id,
}, { ctlType: "none" })
}
})
} else {
ctx.setFieldState(path, _state => _state.loading = true)
ctx.setFieldState(path, _state => {
_state.loading = true
_state.props["x-component-props"].times++
})
}
}
})
......@@ -311,7 +315,7 @@ export const useOrderUpdateChangeOther = (ctx: ISchemaFormActions | ISchemaFormA
FormEffectHooks.onFieldValueChange$('deliveryAddresId').subscribe(state => {
const { value, path } = state
if(pageStatus === PageStatus.EDIT){
if(state?.dataSource?.length && state.loading) {
if(state?.dataSource?.length && state.loading && state.props["x-component-props"].times > 2) {
ctx.submit((values) => {
// console.log(values, value, path, '发货地址id')
if(values){
......@@ -319,39 +323,19 @@ export const useOrderUpdateChangeOther = (ctx: ISchemaFormActions | ISchemaFormA
...values,
deliveryTime: moment(values.deliveryTime).valueOf(),
theInvoiceId: values.theInvoiceId,
// needTheInvoice: Number(values.needTheInvoice),
needTheInvoice: Number(values.needTheInvoice),
deliveryAddresId: value?.id ? value.id : value,
id,
}, { ctlType: "none" })
}
})
} else {
ctx.setFieldState(path, _state => _state.loading = true)
ctx.setFieldState(path, _state => {
_state.loading = true
_state.props["x-component-props"].times++
})
}
}
})
// FormEffectHooks.onFieldValueChange$('needTheInvoice').subscribe(state => {
// const { value, path } = state
// if(pageStatus === PageStatus.EDIT){
// if(state?.dataSource?.length && state.loading) {
// ctx.submit((values) => {
// console.log(values, value, path, '是否需要发票')
// if(values){
// // PublicApi.postOrderProcurementOrderUpdate({
// // ...values,
// // deliveryTime: moment(values.deliveryTime).valueOf(),
// // theInvoiceId: value.id,
// // needTheInvoice: Number(values.needTheInvoice),
// // deliveryAddresId: path.indexOf("deliveryAddresId") !== -1 ? ( value?.id ? value.id : value ) : values.deliveryAddresId,
// // id,
// // }, { ctlType: "none" })
// }
// })
// } else {
// ctx.setFieldState(path, _state => _state.loading = true)
// }
// }
// })
}
......@@ -311,7 +311,8 @@ const submitInfo: ISchema = {
}
},
"x-component-props": {
dataSource: []
dataSource: [],
times: 0,
},
"x-rules": [
{
......@@ -366,6 +367,9 @@ const ortherInfo: ISchema = {
type: 'number',
title: ' ',
"x-component": "theInvoiceList",
"x-component-props": {
times: 0,
}
},
pageRequire: {
type: 'string',
......
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