diff --git a/src/api/production/schedule.js b/src/api/production/schedule.js index f08b8d6..aa6b769 100644 --- a/src/api/production/schedule.js +++ b/src/api/production/schedule.js @@ -33,3 +33,6 @@ export const searchDefectHistByReport=data => createAPI(`schedule/searchDefectHi export const getdefectList=data => createAPI(`schedule/getdefectList`, 'post', data); export const saveDefectList=data => createAPI(`schedule/saveDefectList`, 'post', data); export const deleteDefectList=data => createAPI(`schedule/deleteDefectList`, 'post', data); + +export const searchWorkCenterDefect=data => createAPI(`schedule/searchWorkCenterDefect`, 'post', data); +export const saveWorkCenterDefect=data => createAPI(`schedule/saveWorkCenterDefect`, 'post', data); diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 39f3cd4..5287ffb 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -497,3 +497,28 @@ a:hover{ left: 0; } +//.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell { +// padding-left: 0px; +//} +.rq .el-table .cell { + line-height: 20px; + font-size: 12px; + height: 20px; +} + +.sl-svg { + overflow: hidden; + float: right; +} + +.rq-bmPic { + position: relative; + width: 100%; + height: 100px; + float: top; + margin-top: 0%; + margin-left: 0%; + overflow: hidden; + display: flex; + justify-content: center; /* 水平居中 */ +} diff --git a/src/views/modules/base/defect.vue b/src/views/modules/base/defect.vue index 78107cf..a4258d2 100644 --- a/src/views/modules/base/defect.vue +++ b/src/views/modules/base/defect.vue @@ -2,13 +2,13 @@
- + - + - + @@ -43,6 +43,7 @@ 关闭 + + + + + +
+ 确定 + 取消 +
+ +
+
@@ -96,6 +118,8 @@ getdefectList, saveDefectList, deleteDefectList, + searchWorkCenterDefect, + saveWorkCenterDefect, } from '@/api/production/schedule.js' import Chooselist from '@/views/modules/common/Chooselist' @@ -201,6 +225,10 @@ remark:'', }, badModalFlag:false, + workCenterVisible: false, + workCenterList: [], + selectWorkCenterList: [], + chooseDefectNo:'', } }, mounted () { @@ -331,8 +359,43 @@ return Y + M + D + H + MM + S; }, + workCenterModel(row) { + this.chooseDefectNo=row.defectNo + this.workCenterVisible = true + this.searchWorkCenterList() - + }, + searchWorkCenterList(){ + searchWorkCenterDefect({site:this.$store.state.user.site, + defectNo: this.chooseDefectNo, + }).then(({data}) => { + this.selectWorkCenterList = data.selectWorkCenterList + this.workCenterList=data.workCenterList + }) + }, + saveWorkCenterDefect(){ + if(this.selectWorkCenterList.length==0){ + this.$message.warning("请选择加工中心") + return false; + } + let inList=[]; + for (let i = 0; i < this.selectWorkCenterList.length; i++) { + let inData={ + site:this.$store.state.user.site, + workCenterNo:this.selectWorkCenterList[i], + defectNo:this.chooseDefectNo + } + inList.push(inData) + } + saveWorkCenterDefect(inList).then(({data}) => { + if (data && data.code === 0) { + this.$message.success( '操作成功') + this.workCenterVisible = false + } else { + this.$message.error(data.msg) + } + }) + }, }, created () { // this.getTableUserColumn() diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue index 0bd9271..8ccfca6 100644 --- a/src/views/modules/base/workCenter.vue +++ b/src/views/modules/base/workCenter.vue @@ -136,6 +136,34 @@ + + + {{buttons.defectModel}} + + + + + + + { this.dataList2 = data.rows2; this.dataList = data.rows1; + this.dataList4 = data.rows3; }) }, getProLineNo(){