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

报表开发

parent cbe73d1b
...@@ -3028,5 +3028,10 @@ ...@@ -3028,5 +3028,10 @@
"合格率": "อัตราคุณสมบัติ", "合格率": "อัตราคุณสมบัติ",
"车间编号": "หมายเลขร้านค้า", "车间编号": "หมายเลขร้านค้า",
"不合格时间": "เวลาที่ไม่เหมาะสม", "不合格时间": "เวลาที่ไม่เหมาะสม",
"不合格备注": "ข้อสังเกตที่ไม่ผ่านการรับรอง" "不合格备注": "ข้อสังเกตที่ไม่ผ่านการรับรอง",
"计划数量": "จำนวนแผน",
"完工数量": "จำนวนเสร็จสมบูรณ์",
"在制进度": "ความคืบหน้าในกระบวนการผลิต",
"需求时间": "เวลาที่ต้องการ",
"报工人员": "พนักงานหนังสือพิมพ์"
} }
...@@ -3028,5 +3028,10 @@ ...@@ -3028,5 +3028,10 @@
"合格率": "合格率", "合格率": "合格率",
"车间编号": "车间编号", "车间编号": "车间编号",
"不合格时间": "不合格时间", "不合格时间": "不合格时间",
"不合格备注": "不合格备注" "不合格备注": "不合格备注",
"计划数量": "计划数量",
"完工数量": "完工数量",
"在制进度": "在制进度",
"需求时间": "需求时间",
"报工人员": "报工人员"
} }
This diff is collapsed.
...@@ -24,24 +24,24 @@ ...@@ -24,24 +24,24 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="tbodys" @row-click="mainTableClick" :max-height="tableHeight"> <el-table v-loading="loading" :data="tbodys" @row-click="mainTableClick" :max-height="tableHeight">
<el-table-column label="项目号" align="center" prop="customerProjectNo"></el-table-column> <el-table-column :label="$t('项目号')" align="center" prop="customerProjectNo"></el-table-column>
<el-table-column label="订单号" align="center" prop="orderCode"></el-table-column> <el-table-column :label="$t('订单号')" align="center" prop="orderCode"></el-table-column>
<el-table-column label="生产工单" align="center" prop="workorderCode"></el-table-column> <el-table-column :label="$t('生产工单')" align="center" prop="workorderCode"></el-table-column>
<el-table-column label="工单类型" align="center" prop="workorderType"> <el-table-column :label="$t('工单类型')" align="center" prop="workorderType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" /> <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品编码" align="center" prop="productCode"></el-table-column> <el-table-column :label="$t('产品编码')" align="center" prop="productCode"></el-table-column>
<el-table-column label="产品名称" align="center" prop="productName"></el-table-column> <el-table-column :label="$t('产品名称')" align="center" prop="productName"></el-table-column>
<el-table-column label="计划数量" align="center" prop="quantity"></el-table-column> <el-table-column :label="$t('计划数量')" align="center" prop="quantity"></el-table-column>
<el-table-column label="完工数量" align="center" prop="quantityProduced"></el-table-column> <el-table-column :label="$t('完工数量')" align="center" prop="quantityProduced"></el-table-column>
<el-table-column label="在制进度" align="center" prop="customerProjectNo"> <el-table-column :label="$t('在制进度')" align="center" prop="customerProjectNo">
<template slot-scope="scope"> <template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="26" :percentage="scope.row.quantityMu" /> <el-progress :text-inside="true" :stroke-width="26" :percentage="scope.row.quantityMu" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="需求时间" align="center" prop="requestDate"></el-table-column> <el-table-column :label="$t('需求时间')" align="center" prop="requestDate"></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
...@@ -52,28 +52,28 @@ ...@@ -52,28 +52,28 @@
/> />
<div class="second-box" v-if="isShowSecond"> <div class="second-box" v-if="isShowSecond">
<el-table v-loading="loadingLeft" :data="tbodysLeft" border @row-click="secondTableClick" :max-height="tableHeightSecond"> <el-table v-loading="loadingLeft" :data="tbodysLeft" border @row-click="secondTableClick" :max-height="tableHeightSecond">
<el-table-column label="状态" align="center" prop="status"></el-table-column> <el-table-column :label="$t('状态')" align="center" prop="status"></el-table-column>
<el-table-column label="工序名称" align="center" prop="processName"></el-table-column> <el-table-column :label="$t('工序名称')" align="center" prop="processName"></el-table-column>
<el-table-column label="派工数量" align="center" prop="quantity"></el-table-column> <el-table-column :label="$t('派工数量')" align="center" prop="quantity"></el-table-column>
<el-table-column label="报工数量" align="center" prop="quantityProduced"> <el-table-column :label="$t('报工数量')" align="center" prop="quantityProduced">
</el-table-column> </el-table-column>
<el-table-column label="合格数量" align="center" prop="quantityQualify"></el-table-column> <el-table-column :label="$t('合格数量')" align="center" prop="quantityQualify"></el-table-column>
<el-table-column label="不合格数量" align="center" prop="quantityUnqualify"></el-table-column> <el-table-column :label="$t('不合格数量')" align="center" prop="quantityUnqualify"></el-table-column>
<el-table-column label="合格率" align="center" prop="passRate"></el-table-column> <el-table-column :label="$t('合格率')" align="center" prop="passRate"></el-table-column>
</el-table> </el-table>
<el-table v-loading="loadingRight" :data="tbodysRight" border :max-height="tableHeightSecond" style="margin-left: 15px"> <el-table v-loading="loadingRight" :data="tbodysRight" border :max-height="tableHeightSecond" style="margin-left: 15px">
<el-table-column label="报工人员" align="center" prop="nickName"></el-table-column> <el-table-column :label="$t('报工人员')" align="center" prop="nickName"></el-table-column>
<el-table-column label="报工数量" align="center" prop="quantityFeedback"></el-table-column> <el-table-column :label="$t('报工数量')" align="center" prop="quantityFeedback"></el-table-column>
<el-table-column label="合格数量" align="center" prop="quantityQualify"></el-table-column> <el-table-column :label="$t('合格数量')" align="center" prop="quantityQualify"></el-table-column>
<el-table-column label="不合格数量" align="center" prop="quantityUnqualify"> <el-table-column :label="$t('不合格数量')" align="center" prop="quantityUnqualify">
</el-table-column> </el-table-column>
<el-table-column label="标准工时" align="center" prop="stdWorkingTime"></el-table-column> <el-table-column :label="$t('标准工时')" align="center" prop="stdWorkingTime"></el-table-column>
<el-table-column label="实际工时" align="center" prop="machineTime"> <el-table-column :label="$t('实际工时')" align="center" prop="machineTime">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row['machineTime'] ? Number(scope.row['machineTime']).toFixed(2) : scope.row['machineTime']}} {{scope.row['machineTime'] ? Number(scope.row['machineTime']).toFixed(2) : scope.row['machineTime']}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报工时间" align="center" prop="feedbackTime"></el-table-column> <el-table-column :label="$t('报工时间')" align="center" prop="feedbackTime"></el-table-column>
</el-table> </el-table>
</div> </div>
......
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