diff --git a/debug.log b/debug.log index af455d92..d69cf9be 100644 --- a/debug.log +++ b/debug.log @@ -1,3 +1,4 @@ [0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0) [0515/102246.688:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0) [0531/081503.881:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0) +[0605/094355.406:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0) diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js index aa1e8c88..317e62b8 100644 --- a/src/api/ManufacturingCenter/ProcessingStatus.js +++ b/src/api/ManufacturingCenter/ProcessingStatus.js @@ -75,7 +75,7 @@ inner join 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝 on 褰撳墠鍔犲伐宸ュ簭琛. inner join 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭 on 褰撳墠鍔犲伐宸ュ簭琛.宸ヨ壓璁″垝娴佹按鍙 = 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭.宸ヨ壓璁″垝娴佹按鍙 and 褰撳墠鍔犲伐宸ュ簭琛.寰呭姞宸ュ伐搴忛『搴 = 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭.宸ュ簭椤哄簭 inner join 杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛宸ヨ壓鍚嶇О on 杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛宸ヨ壓鍚嶇О.宸ヨ壓缂栧彿 = 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭.宸ヨ壓缂栧彿 inner join 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_瑙嗗浘 on 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_瑙嗗浘.宸ヨ壓璁″垝娴佹按鍙 = 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝.宸ヨ壓璁″垝娴佹按鍙 and 褰撳墠鍔犲伐宸ュ簭琛.寰呭姞宸ュ伐搴忛『搴 = 杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_瑙嗗浘.宸ュ簭椤哄簭 -where 缁勪欢娴佹按鍙 = ${num}` +where 鏈哄簥娴佹按鍙 = ${num}` } }) } diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 73b88622..d9e850ea 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -391,11 +391,11 @@ export default { })) }, exportExcel() { - if (!this.Group) { - this.$message.warning('璇烽夋嫨鍒嗙粍') + if (!this.Machine) { + this.$message.warning('璇烽夋嫨鏈哄簥') return } - getExport(this.Group).then(res => { + getExport(this.Machine).then(res => { console.log(res.data) import('@/vendor/Export2Excel').then(excel => { const tHeader = ['鏈哄簥', '缁勫彿', '鍥惧彿鍙婅鏍', '鍒跺搧鍚嶇О', '璁″垝鏁', '鏉愭枡', '褰撳墠宸ュ簭鍚']