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

fix:禅道85、86

This commit is contained in:
shijing 2025-09-03 10:55:15 +08:00
parent 5f8886265d
commit 1d9fa46ba9
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/mtm/route_form.vue
View File

@ -136,6 +136,26 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="project_code=='bxerp'&&processName=='捆棒'">
<el-col :md="12" :sm="24">
<el-form-item label="单丝长度">
<el-input-number
v-model="params_json2.dscd"
:min="0"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="丝径">
<el-input-number
v-model="params_json2.sijing"
:min="0"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="project_code=='bxerp'&&processName=='排一次棒'">
<el-col :md="12" :sm="24">
<el-form-item label="一次丝对边">
@ -191,6 +211,14 @@
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="排板包边">
<el-select v-model="params_json.pbbb" style="width: 100%">
<el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="12" :sm="24">
@ -315,6 +343,10 @@ export default {
pbnum:0,
pbsigao:0,
},
params_json2:{
dscd:0,
sijing:0,
},
visible: false,
isSaveing: false,
materialsIn: [],
@ -451,6 +483,9 @@ export default {
if(that.processName=='排一次棒'){
that.form.params_json = that.params_json;
}
if(that.processName=='捆棒'){
that.form.params_json = that.params_json2;
}
if (that.mode === "add") {
that.$API.mtm.route.create.req(that.form).then((res) => {
that.isSaveing = false;

13
src/views/wpm_bx/wprList.vue
View File

@ -257,15 +257,20 @@ export default {
if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
let params = {};
let name = row.material_name.split('|')[0];
if(that.route_code=='paiyicibang'){
if(that.route_code=='paiyicibang'||that.route_code=='kunbang'){
console.log('that.route_code',that.route_code);
console.log('that.ofromName',that.ofromName);
that.$API.mtm.route.list.req({material_out:row.material,page:0}).then((res) => {
console.log('排一次棒单件打印res',res);
let data = res[0].params_json;
data.number = row.number;
data.name=name;
data.ofrom_name=that.ofrom_name;
data.ofrom_name=that.ofromName;
params.data = data;
if(that.route_code=='paiyicibang'){
params.label_template_name = '排一次棒单件打印模板';
}else{
params.label_template_name = '捆棒单件打印模板';
}
that.$API.cm.labeltemplate.commands.req(params).then((res) => {
let obj = {};
obj.printer_commands = res.commands;
@ -283,7 +288,7 @@ export default {
for(let key in row.oinfo){
oinfo.push(row.oinfo[key])
}
let data = {sigao:'',duibian:'',moban:'',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.ofromName,ofrom_batch:that.ofromBatch};
if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){
params.label_template_name = '脱膜测量单件标签模板';
}else{