Commit 397a40fe4cb705b8c7fa383b16c2eddbb996837f
1 parent
6eb9cca8
首样信息发送要先获取生产执行信息
Showing
1 changed file
with
10 additions
and
4 deletions
src/mes/productionExec/noticeModal/index.js
| @@ -172,7 +172,7 @@ const firstNoticeModal = _props => { | @@ -172,7 +172,7 @@ const firstNoticeModal = _props => { | ||
| 172 | item.sEmployeeName?.includes(filterEmployeeName) || item.sEmployeeNo?.includes(filterEmployeeName) | 172 | item.sEmployeeName?.includes(filterEmployeeName) || item.sEmployeeNo?.includes(filterEmployeeName) |
| 173 | ) || [], | 173 | ) || [], |
| 174 | tableProps: { | 174 | tableProps: { |
| 175 | - onChange: () => {}, | 175 | + onChange: () => { }, |
| 176 | tableHeight: "100%" | 176 | tableHeight: "100%" |
| 177 | }, | 177 | }, |
| 178 | onSelectRowChange: (name, selectedRowKeys) => { | 178 | onSelectRowChange: (name, selectedRowKeys) => { |
| @@ -213,7 +213,7 @@ const firstNoticeModal = _props => { | @@ -213,7 +213,7 @@ const firstNoticeModal = _props => { | ||
| 213 | ...commonBusiness.getTableTypes("slave2", props), | 213 | ...commonBusiness.getTableTypes("slave2", props), |
| 214 | // data: commonFunc.getTableSelectedData({ props, tableName: "slave1" }), | 214 | // data: commonFunc.getTableSelectedData({ props, tableName: "slave1" }), |
| 215 | tableProps: { | 215 | tableProps: { |
| 216 | - onChange: () => {}, | 216 | + onChange: () => { }, |
| 217 | tableHeight: "100%" | 217 | tableHeight: "100%" |
| 218 | }, | 218 | }, |
| 219 | onSelectRowChange: (name, selectedRowKeys) => { | 219 | onSelectRowChange: (name, selectedRowKeys) => { |
| @@ -232,7 +232,7 @@ const firstNoticeModal = _props => { | @@ -232,7 +232,7 @@ const firstNoticeModal = _props => { | ||
| 232 | const tablePropsPost = { | 232 | const tablePropsPost = { |
| 233 | ...commonBusiness.getTableTypes("slave0", props), | 233 | ...commonBusiness.getTableTypes("slave0", props), |
| 234 | tableProps: { | 234 | tableProps: { |
| 235 | - onChange: () => {}, | 235 | + onChange: () => { }, |
| 236 | tableHeight: "100%" | 236 | tableHeight: "100%" |
| 237 | }, | 237 | }, |
| 238 | onSelectRowChange: props.onSelectRowChange | 238 | onSelectRowChange: props.onSelectRowChange |
| @@ -242,7 +242,7 @@ const firstNoticeModal = _props => { | @@ -242,7 +242,7 @@ const firstNoticeModal = _props => { | ||
| 242 | const tableProps = { | 242 | const tableProps = { |
| 243 | ...commonBusiness.getTableTypes("slave4", props), | 243 | ...commonBusiness.getTableTypes("slave4", props), |
| 244 | tableProps: { | 244 | tableProps: { |
| 245 | - onChange: () => {}, | 245 | + onChange: () => { }, |
| 246 | tableHeight: "100%" | 246 | tableHeight: "100%" |
| 247 | } | 247 | } |
| 248 | }; | 248 | }; |
| @@ -266,6 +266,7 @@ const firstNoticeModal = _props => { | @@ -266,6 +266,7 @@ const firstNoticeModal = _props => { | ||
| 266 | viewRow, | 266 | viewRow, |
| 267 | tableName: viewName | 267 | tableName: viewName |
| 268 | }; | 268 | }; |
| 269 | + console.log("🚀 ~ firstNoticeModal ~ viewProps:", viewProps) | ||
| 269 | 270 | ||
| 270 | return ( | 271 | return ( |
| 271 | <Modal | 272 | <Modal |
| @@ -341,6 +342,11 @@ const firstNoticeModal = _props => { | @@ -341,6 +342,11 @@ const firstNoticeModal = _props => { | ||
| 341 | size="large" | 342 | size="large" |
| 342 | type="primary" | 343 | type="primary" |
| 343 | onClick={() => { | 344 | onClick={() => { |
| 345 | + const { sWorkOrderId = "" } = viewProps.viewRow; | ||
| 346 | + if (sWorkOrderId === "undefined" || sWorkOrderId === "") { | ||
| 347 | + message.error("信息丢失,请先点击生产执行获取完整信息!"); | ||
| 348 | + return | ||
| 349 | + } | ||
| 344 | if (commonUtils.isEmptyObject(tablePropsCollect.data)) { | 350 | if (commonUtils.isEmptyObject(tablePropsCollect.data)) { |
| 345 | message.info("请先选择接收人!"); | 351 | message.info("请先选择接收人!"); |
| 346 | return; | 352 | return; |