@@ -472,7 +472,7 @@ const goodstechnologymaken = (props) => { | |||||
goodstechnolog == undefined ? '' : ( | goodstechnolog == undefined ? '' : ( | ||||
goodstechnolog.map((x, index) => { | goodstechnolog.map((x, index) => { | ||||
return ( | return ( | ||||
<ProCard wrap gutter={16} boxShadow title={x.deviceName+'【'+attrvalue+'】'} bodyStyle={{ padding: 0,'overflow-x': 'scrol'}} headStyle={{ padding: '0px 0px', backgroundColor: 'burlywood', paddingLeft: '40%', height: 45 }} extra={[ | |||||
<ProCard wrap gutter={16} boxShadow title={x.deviceName} bodyStyle={{ padding: 0,'overflow-x': 'scrol'}} headStyle={{ padding: '0px 0px', backgroundColor: 'burlywood', paddingLeft: '40%', height: 45 }} extra={[ | |||||
<FormOutlined style={{ marginRight: 10 }} onClick={(e) => { onClickedit(e, x) }} />, | <FormOutlined style={{ marginRight: 10 }} onClick={(e) => { onClickedit(e, x) }} />, | ||||
// <DeleteOutlined style={{ marginRight: 6 }} onClick={(e) => { onClickDevicedele(e, x.deviceId) }} />, | // <DeleteOutlined style={{ marginRight: 6 }} onClick={(e) => { onClickDevicedele(e, x.deviceId) }} />, | ||||
<Popconfirm | <Popconfirm | ||||
@@ -308,8 +308,9 @@ const bomtechnology = (props) => { | |||||
await deleteproducttopics([record.id]).then((r) => { | await deleteproducttopics([record.id]).then((r) => { | ||||
message.success('删除成功,即将刷新'); | message.success('删除成功,即将刷新'); | ||||
var params={productId:props.location.query.values.productId,current:1,pageSize:10} | |||||
LoadtopisData(params) | |||||
actiontopisRef.current.reload(); | |||||
// var params={productId:props.location.query.values.productId,current:1,pageSize:10} | |||||
// LoadtopisData(params) | |||||
}); | }); | ||||
}} | }} | ||||
onCancel={() => { }} | onCancel={() => { }} | ||||
@@ -532,7 +533,7 @@ const handleRemove = async (ids) => { | |||||
id="table1" | id="table1" | ||||
actionRef={actiontopisRef} | actionRef={actiontopisRef} | ||||
rowKey="id" | rowKey="id" | ||||
pagination={{ defaultPageSize: 10,total:total }} | |||||
pagination={{ defaultPageSize: 10 }} | |||||
search={{labelWidth: 120}} | search={{labelWidth: 120}} | ||||
columns={topicscolumns} | columns={topicscolumns} | ||||
toolBarRender={() => [ | toolBarRender={() => [ | ||||
@@ -549,7 +550,7 @@ const handleRemove = async (ids) => { | |||||
]} | ]} | ||||
//数据绑定 | //数据绑定 | ||||
dataSource={dataSource} | |||||
// dataSource={dataSource} | |||||
request={async (params) => { | request={async (params) => { | ||||
var data = []; | var data = []; | ||||
var total = 0; | var total = 0; | ||||
@@ -581,11 +582,11 @@ const handleRemove = async (ids) => { | |||||
actionRef={actiontopismrRef} | actionRef={actiontopismrRef} | ||||
rowKey="id" | rowKey="id" | ||||
search={false} | search={false} | ||||
pagination={{ defaultPageSize: 10,total:total }} | |||||
pagination={{ defaultPageSize: 10}} | |||||
columns={topicsmrcolumns} | columns={topicsmrcolumns} | ||||
toolBarRender={false} | toolBarRender={false} | ||||
//数据绑定 | //数据绑定 | ||||
dataSource={dataSource} | |||||
// dataSource={dataSource} | |||||
request={async (params) => { | request={async (params) => { | ||||
var data = []; | var data = []; | ||||
var total = 0; | var total = 0; | ||||
@@ -287,7 +287,8 @@ const GoodsTypeManage = () => { | |||||
</FooterToolbar> | </FooterToolbar> | ||||
)} | )} | ||||
<Modal title="上传工艺模版" open={isModalOpen} footer={null} maskClosable={false} | <Modal title="上传工艺模版" open={isModalOpen} footer={null} maskClosable={false} | ||||
destroyOnClose onCancel={() => { setDeviceVesionData();setIsModalOpen(false) }}> | |||||
destroyOnClose onCancel={() => { setDeviceVesionData();setdeviceTypeKey(""); | |||||
setProductVesionId('');setIsModalOpen(false) }}> | |||||
<div style={{marginBottom:10}}> | <div style={{marginBottom:10}}> | ||||
<span style={{marginRight:10}}>选择产品</span> | <span style={{marginRight:10}}>选择产品</span> | ||||
<Select style={{width: '60%'}} onChange={handleChange}> | <Select style={{width: '60%'}} onChange={handleChange}> | ||||