Merge pull request 'master' (#198) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/198
This commit is contained in:
2024-11-27 14:35:10 +00:00

View File

@@ -155,8 +155,11 @@ watch(() => props.rowData, (newRowData) => {
if (orderData.value.orderState === '0') { if (orderData.value.orderState === '0') {
inputOrderContent(contentState0) inputOrderContent(contentState0)
} else if (orderData.value.orderState === '1') { } else if (orderData.value.orderState === '1') {
contentState1[1].timestamp = orderData.value.processedTime || '--'
inputOrderContent(contentState1) inputOrderContent(contentState1)
} else if (orderData.value.orderState === '2') { } else if (orderData.value.orderState === '2') {
contentState2[1].timestamp = orderData.value.processedTime || '--'
contentState2[2].timestamp = orderData.value.completionTime || '--'
inputOrderContent(contentState2) inputOrderContent(contentState2)
} }
// console.log(orderContent.value); // console.log(orderContent.value);
@@ -179,7 +182,7 @@ const inputOrderTime = (item, index) => {
} }
const inputOrderContent = (contentState) => { const inputOrderContent = (contentState) => {
console.log('contentState',contentState) // console.log('contentState',contentState)
contentState.map((item, index) => { contentState.map((item, index) => {
inputOrderTime(item, index) inputOrderTime(item, index)
orderContent.value.push(item) orderContent.value.push(item)