Commit 2d2dd714 authored by 张海景's avatar 张海景

update:修改生产工单列表显示和按钮排序

parent 241be9eb
...@@ -86,20 +86,20 @@ ...@@ -86,20 +86,20 @@
<view style="text-align: center; line-height: 80rpx; font-size: 28rpx; font-weight: 600"> <view style="text-align: center; line-height: 80rpx; font-size: 28rpx; font-weight: 600">
{{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }} {{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }}
</view> </view>
<u-button type="warning" @click="commonClick('KnifeTemp')">刀模版上下机</u-button>
<u-button type="primary" @click="commonClick('Refresh')">刷新</u-button> <u-button type="primary" @click="commonClick('Refresh')">刷新</u-button>
<u-button type="success" @click="commonClick('StartTask')">开始作业</u-button> <u-button type="success" @click="commonClick('StartTask')">开始作业</u-button>
<u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button> <u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button>
<u-button type="success" @click="commonClick('Prod')">生产报工</u-button> <u-button type="success" @click="commonClick('Prod')">生产报工</u-button>
<u-button type="primary" @click="commonClick('FinshTask')">完成作业</u-button> <u-button type="primary" @click="commonClick('FinshTask')">完成作业</u-button>
<u-button type="primary" @click="commonClick('abnormal')">异常报告</u-button> <u-button type="primary" @click="commonClick('KnifeTemp')">刀模版上下机</u-button>
<u-button type="primary" @click="commonClick('FeedingInspection')">投料校验</u-button> <u-button type="primary" @click="commonClick('FeedingInspection')">投料校验</u-button>
<u-button type="primary" @click="commonClick('RecoilMaterial')">反冲料登记</u-button> <u-button type="primary" @click="commonClick('RecoilMaterial')">反冲料登记</u-button>
<u-button type="primary" @click="commonClick('MaterialRequest')">领料申请</u-button> <u-button type="primary" @click="commonClick('MaterialRequest')">领料申请</u-button>
<u-button type="primary" @click="commonClick('MaterialReturn')">退料申请</u-button> <u-button type="primary" @click="commonClick('MaterialReturn')">退料申请</u-button>
<u-button type="primary" @click="commonClick('jobAssignment')">作业分派</u-button>
<u-button type="success" @click="commonClick('StockIn')">完工入库申请</u-button>
<u-button type="primary" @click="commonClick('ViewPpicture')">查看图片</u-button> <u-button type="primary" @click="commonClick('ViewPpicture')">查看图片</u-button>
<u-button type="primary" @click="commonClick('jobAssignment')">作业分派</u-button>
<u-button type="warning" @click="commonClick('abnormal')">异常报告</u-button>
<u-button type="primary" @click="commonClick('StockIn')">完工入库申请</u-button>
</scroll-view> </scroll-view>
</view> </view>
...@@ -879,6 +879,7 @@ export default { ...@@ -879,6 +879,7 @@ export default {
{ {
name: 'arrangeCode', name: 'arrangeCode',
label: '编排单号', label: '编排单号',
align: 'center',
width: 85, width: 85,
cellFun: (row, index) => { cellFun: (row, index) => {
console.log(row, index); console.log(row, index);
...@@ -889,26 +890,31 @@ export default { ...@@ -889,26 +890,31 @@ export default {
{ {
name: 'scheduleStartDateStr', name: 'scheduleStartDateStr',
label: '计划开始时间', label: '计划开始时间',
align: 'center',
width: 95 width: 95
}, },
{ {
name: 'scheduleEndDateStr', name: 'scheduleEndDateStr',
label: '计划结束时间', label: '计划结束时间',
align: 'center',
width: 95 width: 95
}, },
{ {
name: 'quantity', name: 'quantity',
label: '任务数量', label: '任务数量',
align: 'center',
width: 70 width: 70
}, },
{ {
name: 'quantityWait', name: 'quantityWait',
label: '可加工数量', label: '可加工数量',
align: 'center',
width: 80 width: 80
}, },
{ {
name: 'status', name: 'status',
label: '状态', label: '状态',
align: 'center',
filters: { filters: {
PREPARE: '未开工', PREPARE: '未开工',
BEGINNING: '已开工', BEGINNING: '已开工',
...@@ -926,6 +932,7 @@ export default { ...@@ -926,6 +932,7 @@ export default {
{ {
name: 'taskCode', name: 'taskCode',
label: '任务单号', label: '任务单号',
align: 'center',
width: 100 width: 100
}, },
// { // {
...@@ -945,16 +952,19 @@ export default { ...@@ -945,16 +952,19 @@ export default {
{ {
name: 'processName', name: 'processName',
label: '工序', label: '工序',
align: 'center',
width: 80 width: 80
}, },
{ {
name: 'quantityQualify', name: 'quantityQualify',
label: '合格数量', label: '合格数量',
align: 'center',
width: 70 width: 70
}, },
{ {
name: 'quantityUnqualify', name: 'quantityUnqualify',
label: '不合格数量', label: '不合格数量',
align: 'center',
width: 80 width: 80
} }
// { // {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment