diff --git a/src/views/modules/qc/sopFileUpload.vue b/src/views/modules/qc/sopFileUpload.vue index d1d745e..a465839 100644 --- a/src/views/modules/qc/sopFileUpload.vue +++ b/src/views/modules/qc/sopFileUpload.vue @@ -289,7 +289,8 @@ export default { fileName: this.searchForm.fileName, fileType: this.searchForm.fileType, sopRevNo: this.searchForm.sopRevNo, - site: this.$store.state.user.site + site: this.$store.state.user.site, + partNo: this.currentPartNo }).then(({data}) => { if (data && data.code === 0) { this.originalFileList = data.page.list || [] // 保存原始数据 diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue index 153b292..f3ea5c1 100644 --- a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue +++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue @@ -3020,20 +3020,25 @@ export default { } this.modelData.orderNo = row.orderNo getShopOrderData(data1).then(({data}) => { - this.modelData = data.rows[0]; - - let inData = { - site: data.rows[0].site, - orderNo: data.rows[0].orderNo, - customerID: data.rows[0].customerID, - partNo: data.rows[0].partNo, - user: this.$store.state.user.name + if (data.rows.length > 0) { + this.modelData = data.rows[0]; + let inData = { + site: data.rows[0].site, + orderNo: data.rows[0].orderNo, + customerID: data.rows[0].customerID, + partNo: data.rows[0].partNo, + user: this.$store.state.user.name + } + getShopOrderDetail(inData).then(({data}) => { + this.dataList = data.rows1 + this.dataList2 = data.rows2 + this.dataList4 = data.rows3; + }) + } else { + this.dataList = [] + this.dataList2 = [] + this.dataList4 = []; } - getShopOrderDetail(inData).then(({data}) => { - this.dataList = data.rows1 - this.dataList2 = data.rows2 - this.dataList4 = data.rows3; - }) }) }, deleteData() {