diff --git a/src/utils/request.js b/src/utils/request.js index 3b562dc..ce0d52b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-20 11:02:29 - * @LastEditTime: 2024-01-29 16:48:54 + * @LastEditTime: 2024-01-30 14:45:55 * @LastEditors: DY * @Description: */ diff --git a/src/views/Quality.vue b/src/views/Quality.vue index 9527e34..69d1c9f 100644 --- a/src/views/Quality.vue +++ b/src/views/Quality.vue @@ -1,7 +1,7 @@ @@ -120,8 +120,11 @@ export default { item.value = item.id return item }) + this.listQuery.productionLineId = this.lineArray[0].value + this.getSection(this.listQuery.productionLineId) } else { this.lineArray = [] + this.listQuery.productionLineId = '' } }) }, @@ -229,7 +232,7 @@ export default { } .quality { background-image: url('./../assets/quality-bg.png'); - height: 100vh; + min-height: 100vh; width: 100vw; padding: 20px 20px; box-sizing: border-box; diff --git a/src/views/Scrap.vue b/src/views/Scrap.vue index 94c4ef5..6573f97 100644 --- a/src/views/Scrap.vue +++ b/src/views/Scrap.vue @@ -1,7 +1,7 @@ @@ -79,7 +79,7 @@
- +
@@ -163,7 +163,8 @@ export default { lineId: undefined, sectionId: undefined, remark: undefined, - logTime: new Date() + source: 1, + logTime: new Date().getTime() }, show: false, simpleShow: false, @@ -251,7 +252,8 @@ export default { lineId: undefined, sectionId: undefined, remark: undefined, - logTime: new Date() + source: 1, + logTime: new Date().getTime() } }, methods: { @@ -369,6 +371,8 @@ export default { console.log('res', res.data.data) if (res && res.data.data.datas.length > 0) { this.lineArray = res.data.data.datas + this.ruleForm.lineId = this.lineArray[0].id + this.getSection(this.ruleForm.lineId) } else { this.lineArray = [] } @@ -392,7 +396,7 @@ export default { type: 'success' }) this.$router.push({ - path: 'home' + path: 'list' }) } }) diff --git a/src/views/ScrapList.vue b/src/views/ScrapList.vue index c91db1f..af7267a 100644 --- a/src/views/ScrapList.vue +++ b/src/views/ScrapList.vue @@ -1,7 +1,7 @@ @@ -53,11 +53,11 @@ const tableProps = [ label: '报废时间' }, { - prop: 'createTime', + prop: 'lineName', label: '产线名称' }, { - prop: 'createTime', + prop: 'sectionName', label: '工段名称' }, {