root/WuXiDiKe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 工单功能打印功能完善

Browse Source
This commit is contained in:
周俊杰
2024-10-14 17:31:46 +08:00
parent 043f25e9ac
commit 4a04171237
11 changed files with 227 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
acs/nladmin-ui/src/api/acs/order/template.js
View File

@@ -1,18 +1,26 @@
import request from '@/utils/request'
export function savePdf(data) {
return request({
url: 'api/template',
method: 'post',
data
})
return request({
url: 'api/template',
method: 'post',
data
})
}
export function see(id) {
return request({
url: 'api/template/id?id=' + id,
method: 'get'
})
return request({
url: 'api/template/id?id=' + id,
method: 'get'
})
}
export default { savePdf, see }
export function del(ids) {
return request({
url: 'api/template/',
method: 'delete',
data: ids
})
}
export default { savePdf, see }

8
acs/nladmin-ui/src/views/acs/order/app.vue
View File

@@ -81,7 +81,7 @@
<el-table-column prop="template_status" label="模板状态" width="100px" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="80px" align="center" fixed="right">
<el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="80px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@@ -91,7 +91,7 @@
修改
</el-button>
</template>
</el-table-column>
</el-table-column>
</el-table>
<pagination />
</div>
@@ -131,8 +131,8 @@ export default {
data() {
return {
isModalVisible: false, // 控制弹框显示的状态
modalWidth: 800, // 弹框宽度
modalHeight: 600, // 弹框高度
modalWidth: 1100, // 弹框宽度
modalHeight: 1000, // 弹框高度
printElements: [],
permission: {
add: ['admin', 'task:add'],

159
acs/nladmin-ui/src/views/acs/order/index.vue
View File

@@ -57,6 +57,22 @@
<el-form-item label="计划数量" prop="planned_quantity">
<el-input v-model="form.planned_quantity" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="贴标信息" prop="labeling_message">
<el-input v-model="form.labeling_message" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="瓶身号" prop="bottle_number">
<el-input v-model="form.bottle_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱号" prop="carton_number">
<el-input v-model="form.carton_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱类型" prop="carton_form">
<el-input v-model="form.carton_form" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱装瓶数量" prop="carton_qty">
<el-input v-model="form.carton_qty" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="计划开始时间">
<el-date-picker
v-model="form.start_time"
@@ -84,15 +100,24 @@
<el-form-item label="实际结束时间">
<el-input v-model="form.device_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item> -->
<el-form-item label="贴标数量" prop="labeling_qty">
<!-- <el-form-item label="贴标数量" prop="labeling_qty">
<el-input v-model="form.labeling_qty" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
</el-form-item> -->
<el-form-item label="所属客户" prop="customer">
<el-input v-model="form.customer" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="是否装冰" prop="is_ice">
<el-input v-model="form.is_ice" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="是否加冰" prop="is_ice">
<el-radio-group v-model="form.is_ice" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否人工贴标" prop="is_labeling">
<el-radio-group v-model="form.is_labeling" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="合格重量" prop="weight_ok">
<el-input v-model="input1" placeholder="合格重量(g)" style="width: 170px;" @change="updateIsIce" />
<el-input v-model="input2" placeholder="误差范围(g)" style="width: 170px;" @change="updateIsIce" />
@@ -136,6 +161,21 @@
</el-form-item>
<el-form-item label="计划数量" prop="planned_quantity">
<el-input v-model="form1.planned_quantity" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="贴标信息" prop="labeling_message">
<el-input v-model="form.labeling_message" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="瓶身号" prop="bottle_number">
<el-input v-model="form1.bottle_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱号" prop="carton_number">
<el-input v-model="form1.carton_number" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱类型" prop="carton_form">
<el-input v-model="form1.carton_form" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="纸箱装瓶数量" prop="carton_qty">
<el-input v-model="form1.carton_qty" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="计划开始时间">
<el-input v-model="form1.start_time" disabled style="width: 370px;" @change="isDisabled=false" />
@@ -143,15 +183,24 @@
<el-form-item label="计划结束时间">
<el-input v-model="form1.end_time" disabled style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="贴标数量" prop="labeling_qty">
<!-- <el-form-item label="贴标数量" prop="labeling_qty">
<el-input v-model="form1.labeling_qty" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
</el-form-item> -->
<el-form-item label="所属客户" prop="customer">
<el-input v-model="form1.customer" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="是否装冰" prop="is_ice">
<el-input v-model="form1.is_ice" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="是否加冰" prop="is_ice">
<el-radio-group v-model="form.is_ice" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否人工贴标" prop="is_labeling">
<el-radio-group v-model="form.is_labeling" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="合格重量" prop="weight_ok">
<el-input v-model="input3" placeholder="合格重量(g)" style="width: 170px;" @change="updateIsIce1" />
<el-input v-model="input4" placeholder="误差范围(g)" style="width: 170px;" @change="updateIsIce1" />
@@ -185,6 +234,11 @@
<el-table-column prop="device_code" label="设备" width="100px" />
<el-table-column prop="production_orders" label="生产订单" :min-width="flexWidth('production_orders',crud.data,'生产订单')" />
<el-table-column prop="production_materials" label="生产物料" :min-width="flexWidth('production_materials',crud.data,'生产物料')" />
<el-table-column prop="labeling_message" label="贴标信息" :min-width="flexWidth('labeling_message',crud.data,'贴标信息')" />
<el-table-column prop="bottle_number" label="瓶身号" :min-width="flexWidth('bottle_number',crud.data,'瓶身号')" />
<el-table-column prop="carton_number" label="纸箱号" :min-width="flexWidth('carton_number',crud.data,'纸箱号')" />
<el-table-column prop="carton_form" label="纸箱类型" :min-width="flexWidth('carton_form',crud.data,'纸箱类型')" />
<el-table-column prop="carton_qty" label="纸箱装瓶数量" :min-width="flexWidth('carton_qty',crud.data,'纸箱装瓶数量')" />
<el-table-column prop="ticket_status" label="状态" width="80px">
<template slot-scope="scope">
{{ getAgvSystemLabel(scope.row.ticket_status) }}
@@ -196,9 +250,26 @@
<el-table-column prop="finish_qty" label="实际完成数量" :min-width="flexWidth('finish_qty',crud.data,'实际完成数量')" />
<el-table-column prop="actual_start_time" label="实际开始时间" :min-width="flexWidth('actual_start_time',crud.data,'实际开始时间')" />
<el-table-column prop="actual_end_time" label="实际结束时间" :min-width="flexWidth('actual_end_time',crud.data,'实际结束时间')" />
<el-table-column prop="labeling_qty" label="贴标数量" width="80px" />
<!-- <el-table-column prop="labeling_qty" label="贴标数量" width="80px" /> -->
<el-table-column prop="customer" label="所属客户" width="80px" />
<el-table-column prop="is_ice" label="是否装冰" width="80px" />
<el-table-column
prop="is_ice"
label="是否加冰"
:min-width="flexWidth('is_needmove',crud.data,'是否加冰')"
>
<template slot-scope="scope">
{{ scope.row.is_ice ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column
prop="is_labeling"
label="是否加冰"
:min-width="flexWidth('is_labeling',crud.data,'是否加冰')"
>
<template slot-scope="scope">
{{ scope.row.is_ice ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="80px" align="center" fixed="right">
@@ -335,26 +406,37 @@ export default {
production_orders: null,
production_materials: null,
planned_quantity: null,
bottle_number: null,
carton_number: null,
carton_form: null,
carton_qty: null,
start_time: null,
end_time: null,
labeling_qty: null,
labeling_message: null,
customer: null,
is_ice: null,
is_labeling: null,
weight_ok: null,
ticket_status: null
},
form1: {
ticket_id: null,
ticket_code: null,
device_code: null,
production_orders: null,
production_materials: null,
planned_quantity: null,
bottle_number: null,
carton_number: null,
carton_form: null,
carton_qty: null,
start_time: null,
end_time: null,
labeling_qty: null,
labeling_message: null,
customer: null,
is_ice: null,
is_labeling: null,
weight_ok: null,
ticket_status: null
},
@@ -386,9 +468,25 @@ export default {
planned_quantity: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
labeling_qty: [
{ required: true, message: '贴标数量不能为空', trigger: 'blur' }
bottle_number: [
{ required: true, message: '瓶身号不能为空', trigger: 'blur' }
],
carton_number: [
{ required: true, message: '纸箱号不能为空', trigger: 'blur' }
],
carton_form: [
{ required: true, message: '纸箱类型不能为空', trigger: 'blur' }
],
carton_qty: [
{ required: true, message: '纸箱装瓶数量不能为空', trigger: 'blur' }
],
labeling_message: [
{ required: true, message: '贴标信息不能为空', trigger: 'blur' }
],
// labeling_qty: [
// { required: true, message: '贴标数量不能为空', trigger: 'blur' }
// ],
customer: [
{ required: true, message: '所属客户不能为空', trigger: 'blur' }
]
@@ -497,19 +595,24 @@ export default {
this.formDia = false
this.isDisabled = true
this.form = {
ticket_id: null,
ticket_code: null,
device_code: null,
production_orders: null,
production_materials: null,
planned_quantity: null,
start_time: null,
end_time: null,
labeling_qty: null,
customer: null,
is_ice: null,
weight_ok: null,
ticket_status: null
ticket_id: null,
device_code: null,
production_orders: null,
production_materials: null,
planned_quantity: null,
bottle_number: null,
carton_number: null,
carton_form: null,
carton_qty: null,
start_time: null,
end_time: null,
labeling_qty: null,
labeling_message: null,
customer: null,
is_ice: null,
is_labeling: null,
weight_ok: null,
ticket_status: null
}
})
this.extension = [{

1
acs/nladmin-ui/src/views/acs/order/template.vue
View File

@@ -161,6 +161,7 @@ export default {
this.hiprintTemplate = new hiprint.PrintTemplate({
settingContainer: '#PrintElementOptionSetting' // 元素参数容器
})
this.hiprintTemplate.addPrintPanel({ width: 200, height: 300, paperFooter: 340, paperHeader: 10 });
// 构建 并填充到 容器中
this.hiprintTemplate.design('#hiprint-printTemplate')
//