Merge pull request 'master' (#198) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/198
This commit is contained in:
@@ -155,8 +155,11 @@ watch(() => props.rowData, (newRowData) => {
|
||||
if (orderData.value.orderState === '0') {
|
||||
inputOrderContent(contentState0)
|
||||
} else if (orderData.value.orderState === '1') {
|
||||
contentState1[1].timestamp = orderData.value.processedTime || '--'
|
||||
inputOrderContent(contentState1)
|
||||
} else if (orderData.value.orderState === '2') {
|
||||
contentState2[1].timestamp = orderData.value.processedTime || '--'
|
||||
contentState2[2].timestamp = orderData.value.completionTime || '--'
|
||||
inputOrderContent(contentState2)
|
||||
}
|
||||
// console.log(orderContent.value);
|
||||
@@ -179,7 +182,7 @@ const inputOrderTime = (item, index) => {
|
||||
}
|
||||
|
||||
const inputOrderContent = (contentState) => {
|
||||
console.log('contentState',contentState)
|
||||
// console.log('contentState',contentState)
|
||||
contentState.map((item, index) => {
|
||||
inputOrderTime(item, index)
|
||||
orderContent.value.push(item)
|
||||
|
||||
Reference in New Issue
Block a user