Skip to content

M
mes-pad
Commit f432c744 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

问题清单

parent 4c33ce90
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 102 deletions
lang/th_TH.json
View file @ f432c744
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"外协": "การผลิตภายนอก", "外协": "การผลิตภายนอก",
"生产": "การผลิต", "生产": "การผลิต",
"扫码": "สแกนรหัส", "扫码": "สแกนรหัส",
"请输入工单编号或编排单号": "กรุณาใส่หมายเลขคำสั่งหรือหมายเลขการจัดเรียง", "请输入生产工单号和工序任务单号": "โปรดป้อนหมายเลขงานผลิตและหมายเลขงานกระบวนการ",
"当前可加工": "สามารถผลิตได้ในปัจจุบัน", "当前可加工": "สามารถผลิตได้ในปัจจุบัน",
"搜索": "ค้นหา", "搜索": "ค้นหา",
"可选订单数：{0}": "จำนวนคำสั่งที่เลือกได้：{0}", "可选订单数：{0}": "จำนวนคำสั่งที่เลือกได้：{0}",
......
lang/zh_CN.json
View file @ f432c744
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"外协": "外协", "外协": "外协",
"生产": "生产", "生产": "生产",
"扫码": "扫码", "扫码": "扫码",
"请输入工单编号或编排单号": "请输入工单编号或编排单号", "请输入生产工单号和工序任务单号": "请输入生产工单号和工序任务单号",
"当前可加工": "当前可加工", "当前可加工": "当前可加工",
"搜索": "搜索", "搜索": "搜索",
"可选订单数：{0}": "可选订单数：{0}", "可选订单数：{0}": "可选订单数：{0}",
......
pages/mes/prodReport/index.vue
View file @ f432c744
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
label-width="50px" label-width="50px"
name="arrangeCode" name="arrangeCode"
> >
<view class="public-input" style="width: 200px"> <view class="public-input" style="width: 250px">
<u-input <u-input
v-model="tableParams.arrangeCode" v-model="tableParams.arrangeCode"
@confirm="confirmArrange($event)" @confirm="confirmArrange($event)"
:placeholder="$t('请输入工单编号或编排单号')" :placeholder="$t('请输入生产工单号和工序任务单号')"
/> />
</view> </view>
</u-form-item> </u-form-item>
...@@ -1002,7 +1002,7 @@ export default { ...@@ -1002,7 +1002,7 @@ export default {
name: 'arrangeCode', name: 'arrangeCode',
label: i18n.t('工单编号'), label: i18n.t('工单编号'),
align: 'center', align: 'center',
width: 85, width: 200,
}, },
{ {
name: 'scheduleStartDateStr', name: 'scheduleStartDateStr',
...@@ -1041,31 +1041,12 @@ export default { ...@@ -1041,31 +1041,12 @@ export default {
}, },
width: 65, width: 65,
}, },
// {
// name: 'date',
// label: '批号',
// width: 50,
// },
{ {
name: 'taskCode', name: 'taskCode',
label: i18n.t('任务单号'), label: i18n.t('任务单号'),
align: 'center', align: 'center',
width: 100, width: 100,
}, },
// {
// name: 'workorderCode',
// label: '生产单号',
// width: 120
// },
// {
// name: 'itemCode',
// label: '物料编号',
// width: 110,
// },
// {
// name: 'itemName',
// label: '物料名称'
// },
{ {
name: 'processName', name: 'processName',
label: i18n.t('工序'), label: i18n.t('工序'),
...@@ -1082,14 +1063,8 @@ export default { ...@@ -1082,14 +1063,8 @@ export default {
name: 'quantityUnqualify', name: 'quantityUnqualify',
label: i18n.t('不合格数量'), label: i18n.t('不合格数量'),
align: 'center', align: 'center',
width: 80, width: 70,
}, },
// {
// name: 'clientName',
// label: '作业人员',
// width: 60,
// align: 'center'
// }
], ],
dModelData: [], dModelData: [],
tableSelectData: [], tableSelectData: [],
...@@ -1343,78 +1318,79 @@ export default { ...@@ -1343,78 +1318,79 @@ export default {
] ]
} else { } else {
this.tableColumn = [ this.tableColumn = [
{ {
type: 'radio', type: 'radio',
width: 60, width: 60,
}, },
{ {
name: 'arrangeCode', name: 'arrangeCode',
label: i18n.t('工单编号'), label: i18n.t('工单编号'),
align: 'center', align: 'center',
width: 85, width: 180,
}, },
{ {
name: 'scheduleStartDateStr', name: 'scheduleStartDateStr',
label: i18n.t('计划开始时间'), label: i18n.t('计划开始时间'),
align: 'center', align: 'center',
width: 95, width: 140,
}, },
{ {
name: 'scheduleEndDateStr', name: 'scheduleEndDateStr',
label: i18n.t('计划结束时间'), label: i18n.t('计划结束时间'),
align: 'center', align: 'center',
width: 95, width: 140,
}, },
{ {
name: 'quantity', name: 'quantity',
label: i18n.t('任务数量'), label: i18n.t('任务数量'),
align: 'center', align: 'center',
width: 70, width: 70,
}, },
{ {
name: 'quantityWait', name: 'quantityWait',
label: i18n.t('可加工数量'), label: i18n.t('可加工数量'),
align: 'center', align: 'center',
width: 80, width: 80,
}, },
{ {
name: 'status', name: 'status',
label: i18n.t('状态'), label: i18n.t('状态'),
align: 'center', align: 'center',
filters: { filters: {
PREPARE: i18n.t('未开工'), PREPARE: i18n.t('未开工'),
BEGINNING: i18n.t('已开工'), BEGINNING: i18n.t('已开工'),
PAUSE: i18n.t('暂停'), PAUSE: i18n.t('暂停'),
ERROR_STOP: i18n.t('异常停工'), ERROR_STOP: i18n.t('异常停工'),
FINISH: i18n.t('完工'), FINISH: i18n.t('完工'),
},
width: 65,
},
{
name: 'taskCode',
label: i18n.t('任务单号'),
align: 'center',
width: 100,
},
{
name: 'processName',
label: i18n.t('工序'),
align: 'center',
width: 80,
},
{
name: 'quantityQualify',
label: i18n.t('合格数量'),
align: 'center',
width: 70,
},
{
name: 'quantityUnqualify',
label: i18n.t('不合格数量'),
align: 'center',
width: 80,
}, },
] width: 65,
},
{
name: 'taskCode',
label: i18n.t('任务单号'),
align: 'center',
width: 100,
},
{
name: 'processName',
label: i18n.t('工序'),
align: 'center',
width: 80,
},
{
name: 'quantityQualify',
label: i18n.t('合格数量'),
align: 'center',
width: 70,
},
{
name: 'quantityUnqualify',
label: i18n.t('不合格数量'),
align: 'center',
width: 70,
},
]
} }
}) })
...@@ -3211,6 +3187,7 @@ export default { ...@@ -3211,6 +3187,7 @@ export default {
// color:#fff !important; // color:#fff !important;
} }
/deep/ .item-tr.selectrow .item-td { /deep/ .item-tr.selectrow .item-td {
background: #00ffff !important; background: #00ffff !important;
// color:#fff !important; // color:#fff !important;
} }
......
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