Commit c097f6a3 authored by 沈翠玲's avatar 沈翠玲

问题清单

parent 7fe0e0a8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<!--设备数据--> <!--设备数据-->
<el-col :span="24" :xs="24"> <el-col :span="24" :xs="24">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item :label="$t('不合格原因')" prop="abnormalReason"> <el-form-item :label="$t('不合格原因')" prop="abnormalReason">
<el-input <el-input
v-model="queryParams.abnormalReason" v-model="queryParams.abnormalReason"
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
<el-radio v-model="selectedMachineryId" :label="scope.row.abnormalId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio v-model="selectedMachineryId" :label="scope.row.abnormalId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('不合格原因')" width = "120" align="center" key="abnormalReason" prop="abnormalReason"> <el-table-column :label="$t('不合格原因')" width="240" align="center" key="abnormalReason" prop="abnormalReason">
</el-table-column> </el-table-column>
<el-table-column :label="$t('备注')" min-width="120" align="left" key="remark" prop="remark" :show-overflow-tooltip="true" /> <el-table-column :label="$t('备注')" min-width="120" align="left" key="remark" prop="remark" :show-overflow-tooltip="true" />
<el-table-column :label="$t('创建人')" min-width="120" align="left" key="createBy" prop="createBy" :show-overflow-tooltip="true" /> <el-table-column :label="$t('创建人')" min-width="60" align="left" key="createBy" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column :label="$t('创建时间')" min-width="120" align="left" key="createTime" prop="createTime" :show-overflow-tooltip="true" /> <el-table-column :label="$t('创建时间')" min-width="120" align="left" key="createTime" prop="createTime" :show-overflow-tooltip="true" />
</el-table> </el-table>
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
...this.queryParams, ...this.queryParams,
abnormalType: 'UNQUALIFIED_REASON' abnormalType: 'UNQUALIFIED_REASON'
} }
listInformation(this.queryParams).then(response => { listInformation(params).then(response => {
this.machineryList = response.rows; this.machineryList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
......
...@@ -1608,10 +1608,10 @@ ...@@ -1608,10 +1608,10 @@
"任务单名称": "ชื่อเอกสารการทำงาน", "任务单名称": "ชื่อเอกสารการทำงาน",
"工作中心名称": "ชื่อศูนย์ทำงาน", "工作中心名称": "ชื่อศูนย์ทำงาน",
"完成生产时间": "เวลาที่ทำการผลิตเสร็จสิ้น", "完成生产时间": "เวลาที่ทำการผลิตเสร็จสิ้น",
"排产": "การจัดการการผลิต", "排产": "ยกเลิกการผลิต",
"添加任务单": "เพิ่มเอกสารการทำงาน", "添加任务单": "เพิ่มเอกสารการทำงาน",
"查看任务单信息": "ดูข้อมูลเอกสารการทำงาน", "查看任务单信息": "ดูข้อมูลเอกสารการทำงาน",
"生产排产": "การจัดการการผลิต", "生产排产": "ยกเลิกการผลิต",
"是否完成任务单编制?【完成后将不能更改】": "คุณแน่ใจหรือไม่ว่าจะเสร็จสิ้นการจัดทำเอกสารการทำงาน? 【หลังจากเสร็จแล้วจะไม่สามารถแก้ไขได้】", "是否完成任务单编制?【完成后将不能更改】": "คุณแน่ใจหรือไม่ว่าจะเสร็จสิ้นการจัดทำเอกสารการทำงาน? 【หลังจากเสร็จแล้วจะไม่สามารถแก้ไขได้】",
"添加生产任务": "เพิ่มภารกิจการผลิต", "添加生产任务": "เพิ่มภารกิจการผลิต",
"修改生产任务": "แก้ไขภารกิจการผลิต", "修改生产任务": "แก้ไขภารกิจการผลิต",
...@@ -3055,5 +3055,6 @@ ...@@ -3055,5 +3055,6 @@
"十月": "ตุลาคม", "十月": "ตุลาคม",
"十一月": "พฤศจิกายน", "十一月": "พฤศจิกายน",
"十二月": "ธันวาคม", "十二月": "ธันวาคม",
"排产次数": "จำนวนการปลดปล่อย" "排产次数": "จำนวนการปลดปล่อย",
"品名": "ชื่อสินค้า"
} }
...@@ -3055,5 +3055,6 @@ ...@@ -3055,5 +3055,6 @@
"十月": "十月", "十月": "十月",
"十一月": "十一月", "十一月": "十一月",
"十二月": "十二月", "十二月": "十二月",
"排产次数": "排产次数" "排产次数": "排产次数",
"品名": "品名"
} }
<template> <template>
<div class="app-container" style="display: flex;"> <div class="app-container" style="display: flex;">
<div style="width: 400px; margin-right:10px;"> <div style="width: 268px; margin-right:10px;">
<el-form :model="queryWorkunitParams" ref="queryWorkunitForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryWorkunitParams" ref="queryWorkunitForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('车间')" prop="workshopId"> <el-form-item :label="$t('车间')" prop="workshopId">
<el-select filterable v-model="queryWorkunitParams.workshopId" clearable @change="handleChangeWorkshopId"> <el-select filterable v-model="queryWorkunitParams.workshopId" clearable @change="handleChangeWorkshopId" style="width: 180px">
<el-option <el-option
v-for="dict in workshopList" v-for="dict in workshopList"
:key="dict.workshopId" :key="dict.workshopId"
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('common.workstation')" prop="workstationId"> <el-form-item :label="$t('common.workstation')" prop="workstationId">
<el-select filterable v-model="queryWorkunitParams.workstationId" clearable @change="handleChangeWorkStationId"> <el-select filterable v-model="queryWorkunitParams.workstationId" clearable @change="handleChangeWorkStationId" style="width: 180px">
<el-option <el-option
v-for="dict in workstationList" v-for="dict in workstationList"
:key="dict.workstationId" :key="dict.workstationId"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div v-else style="text-align: center;margin-top:30px;color:#ccc;">{{$t('暂无数据')}}</div> <div v-else style="text-align: center;margin-top:30px;color:#ccc;">{{$t('暂无数据')}}</div>
</div> </div>
</div> </div>
<div style="width: calc(100% - 400px);"> <div style="width: calc(100% - 268px);">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item :label="$t('任务号')" prop="taskCode"> <el-form-item :label="$t('任务号')" prop="taskCode">
<el-input <el-input
...@@ -185,7 +185,8 @@ ...@@ -185,7 +185,8 @@
<el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('工单编码')" align="center" prop="workorderCode" /> <el-table-column :label="$t('工单编码')" align="center" prop="workorderCode" width="130" />
<el-table-column :label="$t('品名')" align="center" prop="itemName" width="130" />
<el-table-column :label="$t('排产次数')" align="center" prop="taskBatch" > <el-table-column :label="$t('排产次数')" align="center" prop="taskBatch" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.taskBatch.split('-').length > 1 ? scope.row.taskBatch.split('-')[scope.row.taskBatch.split('-').length - 1]: ''}} {{scope.row.taskBatch.split('-').length > 1 ? scope.row.taskBatch.split('-')[scope.row.taskBatch.split('-').length - 1]: ''}}
...@@ -955,7 +956,6 @@ export default { ...@@ -955,7 +956,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.cardBox{ .cardBox{
padding: 10px; padding: 10px;
margin-right:30px;
max-height:600px; max-height:600px;
overflow-y:auto; overflow-y:auto;
.list{ .list{
......
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