fix:光芯生产执行恢复

This commit is contained in:
shijing 2024-12-17 10:28:41 +08:00
parent b435f9ed10
commit ce57e0c5e1
3 changed files with 16 additions and 52 deletions

View File

@ -14,7 +14,7 @@
icon="el-icon-plus" icon="el-icon-plus"
@click="table_add(20)" @click="table_add(20)"
v-auth="'handover.create'" v-auth="'handover.create'"
v-if="mgroup_name!=='切片'&&mgroup_name!=='拉单丝'&&mgroup_name!=='一次复丝'&&mgroup_name!=='二次复丝'&&mgroup_name!=='切丝排版'" v-if="mgroupName!=='切片'&&mgroupName!=='拉单丝'&&mgroupName!=='一次复丝'&&mgroupName!=='二次复丝'&&mgroupName!=='切丝排版'"
>返工</el-button >返工</el-button
> >
<el-button <el-button
@ -27,7 +27,7 @@
icon="el-icon-plus" icon="el-icon-plus"
@click="table_add(30)" @click="table_add(30)"
v-auth="'handover.create'" v-auth="'handover.create'"
v-if="mgroup_name=='一次超洗'||mgroup_name=='二次超洗'" v-if="mgroupName=='一次超洗'||mgroupName=='二次超洗'"
>检验</el-button >检验</el-button
> >
</div> </div>
@ -104,7 +104,7 @@
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="count" width="80"></el-table-column> <el-table-column label="数量" prop="count" width="80"></el-table-column>
<el-table-column label="交接类型" prop="type" width="100"> <el-table-column label="交接类型" prop="type" width="100">
<template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'"> <template #default="scope" v-if="mgroupName=='size'||mgroupName=='facade'">
<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text> <el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text> <el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
</template> </template>
@ -211,7 +211,7 @@
v-if="dialog.save" v-if="dialog.save"
ref="saveDialog" ref="saveDialog"
:type="type" :type="type"
:mgroupName="mgroup_name" :mgroupName="mgroupName"
:mgroupId="mgroupId" :mgroupId="mgroupId"
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialog.save = false" @closed="dialog.save = false"
@ -279,29 +279,15 @@ export default {
printer_name: "", printer_name: "",
printVisible:false, printVisible:false,
setNameVisible: false, setNameVisible: false,
mgroup_name:'',
}; };
}, },
watch: {
mgroupName: {
handler: function (newval,odlval) {
let that = this;
that.params.dept = "";
that.params.mgroup = "";
that.apiObj = null;
that.mgroup_name = newval;
that.getMgroupInfo();
},
},
},
mounted() { mounted() {
// this.getMgroupInfo(); this.getMgroupInfo();
}, },
methods: { methods: {
getMgroupInfo(){ getMgroupInfo(){
let that = this; let that = this;
console.log('that.mgroup_name',that.mgroup_name); if(that.mgroupName=="size"){//
if(that.mgroup_name=="size"){//
// that.params.material__process__name=""; // that.params.material__process__name="";
that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => { that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
if(res.length>0){ if(res.length>0){
@ -311,7 +297,7 @@ export default {
that.apiObj = that.$API.wpm.handover.list; that.apiObj = that.$API.wpm.handover.list;
that.$refs.table.refresh(); that.$refs.table.refresh();
}) })
}else if(that.mgroup_name=="facade"){// }else if(that.mgroupName=="facade"){//
// that.params.material__process__name=""; // that.params.material__process__name="";
that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => { that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
if(res.length>0){ if(res.length>0){
@ -324,7 +310,7 @@ export default {
}else{// }else{//
that.printer_name = localStorage.getItem("printer_name"); that.printer_name = localStorage.getItem("printer_name");
that.$API.mtm.mgroup.list that.$API.mtm.mgroup.list
.req({ page: 0, name: that.mgroup_name }) .req({ page: 0, name: that.mgroupName })
.then((res) => { .then((res) => {
if (res.length < 1) { if (res.length < 1) {
that.$message.error("获取工段错误"); that.$message.error("获取工段错误");
@ -388,7 +374,7 @@ export default {
searchTypeQuery() { searchTypeQuery() {
let that = this; let that = this;
if (that.searchType == "send") { if (that.searchType == "send") {
if(that.mgroup_name=="size"||that.mgroup_name=="facade"){ if(that.mgroupName=="size"||that.mgroupName=="facade"){
that.query.send_dept = that.deptId; that.query.send_dept = that.deptId;
that.query.recive_dept = ""; that.query.recive_dept = "";
}else{ }else{
@ -396,7 +382,7 @@ export default {
that.query.recive_mgroup = ""; that.query.recive_mgroup = "";
} }
} else if (that.searchType == "recive") { } else if (that.searchType == "recive") {
if(that.mgroup_name=="size"||that.mgroup_name=="facade"){ if(that.mgroupName=="size"||that.mgroupName=="facade"){
that.query.send_dept = ""; that.query.send_dept = "";
that.query.recive_dept =that.deptId; that.query.recive_dept =that.deptId;
}else{ }else{

View File

@ -139,7 +139,7 @@
v-if="dialog.save" v-if="dialog.save"
ref="saveDialog" ref="saveDialog"
:mgroup="mgroupId" :mgroup="mgroupId"
:mgroupName="mgroup_name" :mgroupName="mgroupName"
:itemObj = "checkItem" :itemObj = "checkItem"
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialog.save = false" @closed="dialog.save = false"
@ -149,7 +149,7 @@
v-if="dialog.scrap" v-if="dialog.scrap"
ref="scrapDialog" ref="scrapDialog"
:type="type" :type="type"
:mgroupName="mgroup_name" :mgroupName="mgroupName"
:mgroupId="mgroupId" :mgroupId="mgroupId"
@success="handleScrapSuccess" @success="handleScrapSuccess"
@closed="dialog.scrap = false" @closed="dialog.scrap = false"
@ -245,20 +245,10 @@ export default {
visibleDrawer: false, visibleDrawer: false,
apiObjPrint:this.$API.cm.labelmat.fromWm, apiObjPrint:this.$API.cm.labelmat.fromWm,
wmId:'', wmId:'',
mgroup_name:''
}; };
}, },
mounted() {}, mounted() {
watch: { this.getMgroupInfo();
mgroupName: {
handler: function (newval,odlval) {
let that = this;
that.params.mgroupx = "";
that.apiObj = null;
that.mgroup_name = newval;
that.getMgroupInfo();
},
},
}, },
methods: { methods: {
getMgroupInfo(){ getMgroupInfo(){

View File

@ -27,7 +27,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="可用批" v-if="mgroup_name!='切片'"> <el-table-column label="可用批" v-if="mgroupName!='切片'">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -138,21 +138,9 @@ export default {
// 40: "", // 40: "",
// }, // },
deptId: null, deptId: null,
mgroup_name:'',
deliverShow:false, deliverShow:false,
}; };
}, },
watch: {
mgroupName: {
handler: function (newval,odlval) {
let that = this;
that.params.mgroup = "";
that.apiObj = null;
that.mgroup_name = newval;
that.getMgroupInfo();
},
},
},
mounted() { mounted() {
this.getMgroupInfo(); this.getMgroupInfo();
}, },
@ -160,7 +148,7 @@ export default {
getMgroupInfo(){ getMgroupInfo(){
let that = this; let that = this;
that.$API.mtm.mgroup.list that.$API.mtm.mgroup.list
.req({ page: 0, name: that.mgroup_name }) .req({ page: 0, name: that.mgroupName })
.then((res) => { .then((res) => {
if(res.length>0){ if(res.length>0){
that.mgroupId = res[0].id; that.mgroupId = res[0].id;