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

fix:标签打印添加label，process添加个号转批号按钮，日志详情区分返工和正常交接

This commit is contained in:
shijing 2025-04-28 15:13:41 +08:00
parent 8551b35f24
commit eb016141d6
8 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/inm/mainso.vue
View File

@ -191,8 +191,8 @@ export default {
"REFERENCE 0,0", "REFERENCE 0,0",
'QRCODE 30,400,H,5,A,0,"' +code +'"', 'QRCODE 30,400,H,5,A,0,"' +code +'"',
"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, "WINTEXT 240,550,28,90,0,0,Simhei,"+"批次号：" + res.batch,
"WINTEXT 280,550,28,90,0,0,Simhei," + row.count, "WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
"PRINT 1", "PRINT 1",
]; ];
let obj = {}; let obj = {};

4
src/views/inm/mioitem.vue
View File

@ -489,8 +489,8 @@ export default {
"REFERENCE 0,0", "REFERENCE 0,0",
'QRCODE 30,400,H,5,A,0,"' +code +'"', 'QRCODE 30,400,H,5,A,0,"' +code +'"',
"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, "WINTEXT 240,550,28,90,0,0,Simhei," +"批次号："+ res.batch,
"WINTEXT 280,550,28,90,0,0,Simhei," + row.count, "WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
"PRINT 1", "PRINT 1",
]; ];
let obj = {}; let obj = {};

4
src/views/inm/mioitem_form.vue
View File

@ -111,7 +111,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="mTracking==20&&(form.type == 'do_in' ||form.type == 'pur_in'||form.type == 'other_in')"> <el-col :md="12" :sm="24" v-if="mTracking==20&&(form.type == 'pur_in'||form.type == 'other_in')">
<el-form-item label="数量"> <el-form-item label="数量">
<el-input-number <el-input-number
v-model="form.count" v-model="form.count"
@ -133,7 +133,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="mTracking==20&&form.count>1&&(form.type == 'do_in'||form.type == 'pur_in'||form.type == 'other_in')"> <el-row v-if="mTracking==20&&form.count>1&&(form.type == 'pur_in'||form.type == 'other_in')">
<el-col :md="12" :sm="24" v-for="i in form.count" :key="i"> <el-col :md="12" :sm="24" v-for="i in form.count" :key="i">
<el-form-item :label="'编号'+i"> <el-form-item :label="'编号'+i">
<!-- <el-input-number v-if="i==1" v-model="mioitems[0]" @change="firstNumberChange" placeholder="请输入编号" controls-position="right" style="width:100%"/> --> <!-- <el-input-number v-if="i==1" v-model="mioitems[0]" @change="firstNumberChange" placeholder="请输入编号" controls-position="right" style="width:100%"/> -->

8
src/views/mtm/process_form.vue
View File

@ -73,13 +73,13 @@
></el-switch> ></el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12" v-if="baseCode=='bxerp'"> <el-col :span="12" v-if="baseCode=='bxerp'">
<el-form-item label="是否自检"> <el-form-item label="个号转批号">
<el-switch <el-switch
v-model="form.into_wm_mgroup" v-model="form.number_to_batch"
></el-switch> ></el-switch>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="交接到工段"> <el-form-item label="交接到工段">
<el-switch <el-switch

4
src/views/template/printmaterial.vue
View File

@ -86,8 +86,8 @@ export default {
"REFERENCE 0,0", "REFERENCE 0,0",
'QRCODE 30,400,H,5,A,0,"' +code +'"', 'QRCODE 30,400,H,5,A,0,"' +code +'"',
"WINTEXT 30,380,28,90,0,0,Simhei,容器容量:" + that.counts, "WINTEXT 30,380,28,90,0,0,Simhei,容器容量:" + that.counts,
"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, "WINTEXT 200,550,28,90,0,0,Simhei," +"批次号："+ res.material_name,
"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, "WINTEXT 240,550,28,90,0,0,Simhei," +"数量：" + res.batch,
]; ];
//供应商（仅原料、辅料） //供应商（仅原料、辅料）
if(that.mtype==40||that.mtype==30){ if(that.mtype==40||that.mtype==30){

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

@ -491,8 +491,8 @@ export default {
"REFERENCE 0,0", "REFERENCE 0,0",
'QRCODE 30,400,H,5,A,0,"' +code +'"', 'QRCODE 30,400,H,5,A,0,"' +code +'"',
"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, "WINTEXT 240,550,28,90,0,0,Simhei," +"批次号：" + res.batch,
"WINTEXT 280,550,28,90,0,0,Simhei," + row.count, "WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
"PRINT 1", "PRINT 1",
]; ];
let obj = {}; let obj = {};

29
src/views/wpm_bx/mlog_detail.vue
View File

@ -10,15 +10,15 @@
<div> <div>
<el-card style="width: 100%" header="基本信息" shadow="never"> <el-card style="width: 100%" header="基本信息" shadow="never">
<el-descriptions> <el-descriptions>
<el-descriptions-item label="工艺路线" v-if="!mlogItem.is_fix">{{ <el-descriptions-item label="工艺路线" v-if="!mlogItem.is_fix" style="width: 100%;">
mlogItem.routepack_name {{mlogItem.material_in_name}}->{{mlogItem.material_out_name}}
}}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="输入物料" v-if="!mlogItem.is_fix">{{ <el-descriptions-item label="返工" v-if="mlogItem.is_fix">
mlogItem.material_in_name <span v-if="mlogItem.material_in_name!==null">{{mlogItem.material_in_name}}</span>
}}</el-descriptions-item> <span v-if="mlogItem.material_out_name!==null">->{{mlogItem.material_out_name}}</span>
<el-descriptions-item label="输出物料" v-if="!mlogItem.is_fix">{{ </el-descriptions-item>
mlogItem.material_out_name </el-descriptions>
}}</el-descriptions-item> <el-descriptions>
<el-descriptions-item label="工段名称">{{ <el-descriptions-item label="工段名称">{{
mlogItem.mgroup_name mlogItem.mgroup_name
}}</el-descriptions-item> }}</el-descriptions-item>
@ -39,11 +39,14 @@
{{item.value}} {{item.value}}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<el-descriptions-item label="创建时间">{{
mlogItem.create_time
}}</el-descriptions-item>
<el-descriptions-item label="开始时间">{{ <el-descriptions-item label="开始时间">{{
mlogItem.work_start_time mlogItem.work_start_time
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ <el-descriptions-item label="结束时间">{{
mlogItem.create_time mlogItem.work_end_time
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="指导文件" v-if="route_file!==null"> <el-descriptions-item label="指导文件" v-if="route_file!==null">
<el-button @click="showFile">查看</el-button> <el-button @click="showFile">查看</el-button>
@ -822,8 +825,8 @@ export default {
"REFERENCE 0,0", "REFERENCE 0,0",
'QRCODE 30,400,H,5,A,0,"' +code +'"', 'QRCODE 30,400,H,5,A,0,"' +code +'"',
"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, "WINTEXT 240,550,28,90,0,0,Simhei," +"批次号："+ res.batch,
"WINTEXT 280,550,28,90,0,0,Simhei," + row.count, "WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
"PRINT 1", "PRINT 1",
]; ];
let obj = {}; let obj = {};

4
src/views/wpm_bx/mlogbw_check.vue
View File

@ -785,8 +785,8 @@ export default {
"REFERENCE 0,0", "REFERENCE 0,0",
'QRCODE 30,400,H,5,A,0,"' +code +'"', 'QRCODE 30,400,H,5,A,0,"' +code +'"',
"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name, "WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch, "WINTEXT 240,550,28,90,0,0,Simhei," +"批次号：" + res.batch,
"WINTEXT 280,550,28,90,0,0,Simhei," + row.count, "WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
"PRINT 1", "PRINT 1",
]; ];
let obj = {}; let obj = {};