Commit 2c5254a5 authored by 李驰骋's avatar 李驰骋

去掉右侧切换工作单元换钮

parent 858858ce
...@@ -65,8 +65,6 @@ ...@@ -65,8 +65,6 @@
<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="primary" @click="changeWorkstation">切换工作单元</u-button>
<br/>
<u-button type="warning" @click="commonClick('KnifeTemp')">刀模版上下机</u-button> <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>
...@@ -507,22 +505,6 @@ export default { ...@@ -507,22 +505,6 @@ export default {
type: 'selection', type: 'selection',
width: 35 width: 35
}, },
{
name: 'status',
label: '状态',
filters: {
// 'START': '生产中',
// 'PAUSE': '暂停',
// 'NORMARL': '未开始'
'PREPARE': '未开工',
'START': '已开工',
'PAUSE': '暂停',
'ERROR_STOP': '异常停工',
'FINISHED': '完工'
},
width: 140,
align: "center"
},
{ {
name: 'arrangeCode', name: 'arrangeCode',
label: '编排单号', label: '编排单号',
...@@ -543,23 +525,39 @@ export default { ...@@ -543,23 +525,39 @@ export default {
{ {
name: 'quantity', name: 'quantity',
label: '待加工数量', label: '待加工数量',
width: 80, width: 140,
},
{
name: 'status',
label: '状态',
filters: {
// 'START': '生产中',
// 'PAUSE': '暂停',
// 'NORMARL': '未开始'
'PREPARE': '未开工',
'BEGINNING': '已开工',
'PAUSE': '暂停',
'ERROR_STOP': '异常停工',
'FINISH': '完工'
},
width: 60,
align: "center"
}, },
// { // {
// name: 'date', // name: 'date',
// label: '批号', // label: '批号',
// width: 50, // width: 50,
// }, // },
// { {
// name: 'taskCode', name: 'taskCode',
// label: '任务单号', label: '任务单号',
// width: 110, width: 110,
// }, },
// { {
// name: 'workorderCode', name: 'workorderCode',
// label: '生产单号', label: '生产单号',
// width: 120, width: 120,
// }, },
// { // {
// name: 'itemCode', // name: 'itemCode',
// label: '物料编号', // label: '物料编号',
...@@ -583,21 +581,21 @@ export default { ...@@ -583,21 +581,21 @@ export default {
{ {
name: 'quantityQuanlify', name: 'quantityQuanlify',
label: '合格数量', label: '合格数量',
width: 70, width: 60,
align: "center" align: "center"
}, },
{ {
name: 'quantityUnquanlify', name: 'quantityUnquanlify',
label: '不合格数量', label: '不合格数量',
width: 70, width: 60,
align: "center"
},
{
name: 'clientName',
label: '作业人员',
width: 60,
align: "center" align: "center"
}, },
// {
// name: 'clientName',
// label: '作业人员',
// width: 60,
// align: "center"
// },
], ],
dModelData: [], dModelData: [],
tableSelectData: [], tableSelectData: [],
...@@ -816,7 +814,7 @@ export default { ...@@ -816,7 +814,7 @@ export default {
this.knifeTempVisible = true this.knifeTempVisible = true
return return
} else { } else {
return this.$u.toast('该任务不需刀模板上下机记录') return this.$u.toast('该刀模版具不属于该工单')
} }
this.addDModelRecord(params) this.addDModelRecord(params)
}, },
...@@ -1374,7 +1372,7 @@ export default { ...@@ -1374,7 +1372,7 @@ export default {
.prod-body-right { .prod-body-right {
width: 300rpx; width: 300rpx;
padding: 10rpx; padding: 10rpx;
height: 100vh; overflow: auto;
.u-btn { .u-btn {
height: 100rpx; height: 100rpx;
......
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