|
|
@ -197,7 +197,7 @@ |
|
|
</el-table> |
|
|
</el-table> |
|
|
</el-tab-pane> |
|
|
</el-tab-pane> |
|
|
</el-tabs> |
|
|
</el-tabs> |
|
|
<el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" > |
|
|
|
|
|
|
|
|
<el-dialog title="订单列表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" > |
|
|
<el-table |
|
|
<el-table |
|
|
height="400" |
|
|
height="400" |
|
|
:data="dataList3" |
|
|
:data="dataList3" |
|
|
@ -284,7 +284,7 @@ |
|
|
partNo:'', |
|
|
partNo:'', |
|
|
planner:'', |
|
|
planner:'', |
|
|
orderType:'', |
|
|
orderType:'', |
|
|
date1:new Date(), |
|
|
|
|
|
|
|
|
date1:'', |
|
|
date2:'', |
|
|
date2:'', |
|
|
}, |
|
|
}, |
|
|
modelData: { |
|
|
modelData: { |
|
|
@ -1506,7 +1506,20 @@ |
|
|
} |
|
|
} |
|
|
searchReportInOrderNo(this.searchData).then(({data}) => { |
|
|
searchReportInOrderNo(this.searchData).then(({data}) => { |
|
|
this.dataList3=data.rows; |
|
|
this.dataList3=data.rows; |
|
|
this.modelFlag2=true; |
|
|
|
|
|
|
|
|
if(data.rows.length>0){ |
|
|
|
|
|
this.modelData=data.rows[0]; |
|
|
|
|
|
let inData={ |
|
|
|
|
|
site:this.modelData.site, |
|
|
|
|
|
orderNo:this.modelData.orderNo, |
|
|
|
|
|
user:this.$store.state.user.name |
|
|
|
|
|
} |
|
|
|
|
|
searchItemToBeProduct(inData).then(({data}) => { |
|
|
|
|
|
this.dataList = data.rows |
|
|
|
|
|
}) |
|
|
|
|
|
searchProductionLineOutputReport(inData).then(({data}) => { |
|
|
|
|
|
this.dataList2 = data.rows |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
cancelReport(row){ |
|
|
cancelReport(row){ |
|
|
@ -1523,8 +1536,13 @@ |
|
|
}).then(() => { |
|
|
}).then(() => { |
|
|
cancelReport(data).then(({data}) => { |
|
|
cancelReport(data).then(({data}) => { |
|
|
if (data && data.code == 200) { |
|
|
if (data && data.code == 200) { |
|
|
searchReportInOrderNo(this.searchData).then(({data}) => { |
|
|
|
|
|
this.dataList3=data.rows; |
|
|
|
|
|
|
|
|
let inData={ |
|
|
|
|
|
site: this.modelData.site, |
|
|
|
|
|
orderNo: this.modelData.orderNo, |
|
|
|
|
|
user:this.$store.state.user.name |
|
|
|
|
|
} |
|
|
|
|
|
searchProductionLineOutputReport(inData).then(({data}) => { |
|
|
|
|
|
this.dataList2 = data.rows |
|
|
}) |
|
|
}) |
|
|
this.$message.success( '操作成功') |
|
|
this.$message.success( '操作成功') |
|
|
} else { |
|
|
} else { |
|
|
@ -1536,7 +1554,6 @@ |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
tableHanddle(row){ |
|
|
tableHanddle(row){ |
|
|
console.log(row); |
|
|
|
|
|
this.modelData=row; |
|
|
this.modelData=row; |
|
|
this.modelFlag2=false; |
|
|
this.modelFlag2=false; |
|
|
let inData={ |
|
|
let inData={ |
|
|
|