feat(标签打印): 统一标签字体样式并增强镀锌分步加工功能
- 为所有标签组件添加统一的粗体黑体字体样式 - 修改getGalvanize1TypingPrefill方法参数以支持分页查询 - 在分步加工面板中增加镀锌二级数据展示功能 - 优化分步加工逻辑,支持根据actionType动态加载数据
This commit is contained in:
@@ -67,8 +67,13 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<!-- <el-descriptions :column="1" border title="二级数据" v-if="showSplitForm"></el-descriptions>
|
||||
<el-table v-if="showSplitForm"></el-table> -->
|
||||
<el-descriptions :column="1" border title="镀锌二级数据" v-if="actionType == 501 && showSplitForm"></el-descriptions>
|
||||
<el-table v-if="actionType == 501 && showSplitForm" v-loading="zincLoading" :data="zincList" border stripe @row-click="handleZincItemClick">
|
||||
<el-table-column prop="enterCoilNo" label="入场钢卷号" />
|
||||
<el-table-column prop="createTime" label="生产开始时间" />
|
||||
<el-table-column prop="endTime" label="生产结束时间" />
|
||||
<el-table-column prop="shiftNo" label="班组" />
|
||||
</el-table>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
@@ -268,6 +273,7 @@
|
||||
<script>
|
||||
import { getMaterialCoil, listMaterialCoil, createSpecialChild, completeSpecialSplit, updateMaterialCoilSimple, checkCoilNo, delMaterialCoil } from '@/api/wms/coil'
|
||||
import { completeAction, getPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
|
||||
import { getGalvanize1TypingPrefill } from '@/api/pocket/acidTyping';
|
||||
import ProductSelect from "@/components/KLPService/ProductSelect";
|
||||
import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
|
||||
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
||||
@@ -280,7 +286,7 @@ export default {
|
||||
name: 'StepSplit',
|
||||
props: {
|
||||
actionId: {
|
||||
type: String,
|
||||
type: [String, Number],
|
||||
required: true,
|
||||
},
|
||||
coilId: {
|
||||
@@ -291,6 +297,10 @@ export default {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
actionType: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
ProductSelect,
|
||||
@@ -398,7 +408,10 @@ export default {
|
||||
defectCode: null,
|
||||
degree: null,
|
||||
remark: null
|
||||
}
|
||||
},
|
||||
|
||||
zincList: [],
|
||||
zincLoading: false,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -427,6 +440,16 @@ export default {
|
||||
// 若actionId变化需要重新加载数据,可在此补充逻辑
|
||||
},
|
||||
},
|
||||
actionType: {
|
||||
immediate: true,
|
||||
handler(val) {
|
||||
console.log('actionType', val)
|
||||
if (val == 501) {
|
||||
// 获取镀锌线二级系统数据
|
||||
this.getZincList()
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 查询待分条的钢卷信息
|
||||
@@ -443,6 +466,16 @@ export default {
|
||||
}
|
||||
},
|
||||
|
||||
async getZincList() {
|
||||
this.zincLoading = true
|
||||
const res = await getGalvanize1TypingPrefill({
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
})
|
||||
this.zincList = res.rows || []
|
||||
this.zincLoading = false
|
||||
},
|
||||
|
||||
async handlePrint(row) {
|
||||
this.$emit('print', row)
|
||||
},
|
||||
@@ -557,6 +590,20 @@ export default {
|
||||
this.showSplitForm = false
|
||||
},
|
||||
|
||||
handleZincItemClick(row) {
|
||||
this.splitForm = {
|
||||
...this.splitForm,
|
||||
team: row.shiftNo,
|
||||
// enterCoilNo: row.enterCoilNo,
|
||||
productionStartTime: row.createTime,
|
||||
productionEndTime: row.endTime,
|
||||
itemType: 'product',
|
||||
materialType: '成品',
|
||||
length: row.exitLength,
|
||||
netWeight: row.exitNetWeight,
|
||||
}
|
||||
},
|
||||
|
||||
// 编辑分条项
|
||||
async handleEditSplit(row) {
|
||||
this.showSplitForm = true
|
||||
|
||||
Reference in New Issue
Block a user