diff --git a/src/assets/img/factory.jpg b/src/assets/img/factory.jpg new file mode 100644 index 0000000..1e08684 Binary files /dev/null and b/src/assets/img/factory.jpg differ diff --git a/src/router/index.js b/src/router/index.js index b263602..a4972c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,7 +43,7 @@ const globalRoutes = [ { path: '/SeqNoForLiuHua', component: _import('modules/board/SeqNoForLiuHua'), name: 'SeqNoForLiuHua', meta: { title: '生产派工单看板' } }, { path: '/SORoutingBoardForShuiZhu', component: _import('modules/board/SORoutingBoardForShuiZhu'), name: 'SORoutingBoardForShuiZhu', meta: { title: '水煮烘烤工序看板' } }, { path: '/inspectBoard', component: _import('modules/board/inspectBoard'), name: 'inspectBoard', meta: { title: '实验室检验看板' } }, - + { path: '/sopBoard', component: _import('modules/board/sopBoard'), name: 'sopBoard', meta: { title: '实验室检验看板' } }, ] // 主入口路由(需嵌套上左右整体布局) diff --git a/src/views/modules/board/sopBoard.vue b/src/views/modules/board/sopBoard.vue new file mode 100644 index 0000000..78baed2 --- /dev/null +++ b/src/views/modules/board/sopBoard.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/modules/pad/padPartAttribute.vue b/src/views/modules/pad/padPartAttribute.vue index a44f54f..eb07e0d 100644 --- a/src/views/modules/pad/padPartAttribute.vue +++ b/src/views/modules/pad/padPartAttribute.vue @@ -86,6 +86,9 @@ 下一版本 + + 回退 + + + { + this.lastPart.push({site:this.searchData.site,partNo:lastPartNo}) + this.searchData.partNo = data.rows[0].partNo + this.num=1; + this.bomNum=1; + this.routingNum=1; + this.remark=data.rows[0].remark; + this.searchData.site= data.rows[0].site; + this.partDescription= data.rows[0].partDescription+'/'+data.rows[0].spec; + getPartSubPropertiesValueHeaderData(this.searchData).then(({data}) => { + this.list = data.rows; + this.bomList = data.rows2; + this.routingList = data.rows3; + // if(data.rows.length==0){ + // this.$alert('该物料没有设置属性!', '错误', { + // confirmButtonText: '确定' + // }) + // return false; + // } + this.search(); + this.searchBom(); + this.searchRouting() + this.subCodeDesc=this.list[this.num-1].subCodeDesc; + }) + }) + + }, + jumpLastPart(){ + if(this.lastPart.length==0){ + + return false; + } + getPartData(this.lastPart[this.lastPart.length-1]).then(({data}) => { + this.searchData.partNo = data.rows[0].partNo + this.num=1; + this.bomNum=1; + this.routingNum=1; + this.remark=data.rows[0].remark; + this.searchData.site= data.rows[0].site; + this.partDescription= data.rows[0].partDescription+'/'+data.rows[0].spec; + this.lastPart.pop(); + getPartSubPropertiesValueHeaderData(this.searchData).then(({data}) => { + this.list = data.rows; + this.bomList = data.rows2; + this.routingList = data.rows3; + // if(data.rows.length==0){ + // this.$alert('该物料没有设置属性!', '错误', { + // confirmButtonText: '确定' + // }) + // return false; + // } + this.search(); + this.searchBom(); + this.searchRouting() + if(this.list.length>0) { + this.subCodeDesc = this.list[this.num - 1].subCodeDesc; + }else { + this.subCodeDesc =''; + } + }) + }) }, search(){ if( this.list.length==0){ - + this.tableData =[]; return false; } let postData={ @@ -305,7 +383,8 @@ }, searchBom(){ if( this.bomList.length==0){ - + this.bomTable =[]; + this.bomRevNo=""; return false; } this.bomRevNo=this.bomList[this.bomNum-1].revNo @@ -320,7 +399,8 @@ }, searchRouting(){ if( this.routingList.length==0){ - + this.routingTable =[]; + this.routingRevNo=''; return false; } this.routingRevNo=this.routingList[this.routingNum-1].revNo diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue index 252749c..93cda53 100644 --- a/src/views/modules/production/soscheduleRouting.vue +++ b/src/views/modules/production/soscheduleRouting.vue @@ -180,6 +180,34 @@ min-width="160" label="工序名称"> + + + + + + + +