zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:coding#827#828#829

This commit is contained in:
shijing 2025-05-20 16:17:46 +08:00
parent 69a5dfd1ee
commit e46c2f54bf
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/wpm_bx/handover_form.vue
View File

@ -479,13 +479,17 @@ export default {
return item.id==userInfo.id; return item.id==userInfo.id;
}) })
if(arr.length>0){ if(arr.length>0){
that.form.send_user = userInfo.id; if(that.mode=="add"){
that.form.send_user = userInfo.id;
}
}else{ }else{
let obj = {}; let obj = {};
obj.id = userInfo.id; obj.id = userInfo.id;
obj.name = userInfo.name; obj.name = userInfo.name;
that.userList.push(obj) that.userList.push(obj)
that.form.send_user = userInfo.id; if(that.mode=="add"){
that.form.send_user = userInfo.id;
}
} }
}); });
}, },

17
src/views/wpm_bx/inm.vue
View File

@ -5,7 +5,10 @@
<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'" v-if="route_code=='qingxi'">领料</el-button> <el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'" v-if="route_code=='qingxi'">领料</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button> <el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button>
<el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button> <el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button>
<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'" v-if="route_code=='chenpjiance'">入库</el-button> <el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'"
v-if="route_code=='chengpingneiwaichujian'||route_code=='chengpneizhifujian'||route_code=='chengpingxinengjiance'||
route_code=='chenpjianchicunjiance'||route_code=='chengpwaiguanfujianyi'||route_code=='chengpwaiguanfujianer'"
>入库</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select <el-select
@ -488,19 +491,25 @@ export default {
if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'|| if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||
that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo' that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo'
){ ){
params.label_template_name = '排扳单件打印模板';
let oinfo = []; let oinfo = [];
for(let key in row.oinfo){ for(let key in row.oinfo){
oinfo.push(row.oinfo[key]) oinfo.push(row.oinfo[key])
} }
let data = {sigao:'',duibian:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofrom_name,ofrom_batch:that.ofrom_batch}; let data = {sigao:'',duibian:'',moban:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofrom_name,ofrom_batch:that.ofrom_batch};
if(that.route_code=='zlybcl'||that.route_code=='tuomoceliang'){
params.label_template_name = '脱膜测量单件标签模板';
}else{
params.label_template_name = '排扳单件打印模板';
}
if(oinfo.length>0){ if(oinfo.length>0){
oinfo.forEach((item)=>{ oinfo.forEach((item)=>{
if(item.name=="丝高"){ if(item.name=="丝高"){
data.sigao = item.val; data.sigao = item.val;
}else if(item.name=="对边"){ }else if(item.name=="对边"){
data.duibian = item.val; data.duibian = item.val;
}else{ }else if(item.name=="模板"){
data.moban = item.val;
}else if(item.name=="实验板段"){
data.istest = item.val?'是':'否'; data.istest = item.val?'是':'否';
} }
}) })

2
src/views/wpm_bx/mlog_form.vue
View File

@ -58,7 +58,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="12" :xs="24" v-if="route_code!=='niuzhuan'"> <el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'">
<el-form-item label="生产设备" prop="equipment"> <el-form-item label="生产设备" prop="equipment">
<el-select <el-select
v-model="form.equipment" v-model="form.equipment"