From ac71274114b9d41f5f29b9c125199031737a8528 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 14:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/ReportWork/reportWork.vue | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 3630f05..69f60e3 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -4,51 +4,51 @@
<span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span>
<el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
:start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" />
- <el-select v-model="report.type" placeholder="娓呴�夋嫨绫诲瀷" style="margin-left: 10px;" >
- <el-option label="鍏ㄩ儴" value="0"></el-option>
- <el-option label="瀹屽伐" value="1"></el-option>
- <el-option label="鐮存崯" value="2"></el-option>
- <el-option label="鎷胯蛋" value="3"></el-option>
+ <el-select v-model="report.type" :placeholder="$t('reportmanage.ctype')" style="margin-left: 10px;" >
+ <el-option :label="$t('reportmanage.all')" value="0"></el-option>
+ <el-option :label="$t('reportmanage.completed')" value="1"></el-option>
+ <el-option :label="$t('reportmanage.broke')" value="2"></el-option>
+ <el-option :label="$t('reportmanage.takeout')" value="3"></el-option>
</el-select>
- <el-select v-model="report.status" placeholder="娓呴�夋嫨鐘舵��" style="margin-left: 10px;" >
- <el-option label="鍏ㄩ儴" value="0"></el-option>
- <el-option label="鏈姤宸�" value="1"></el-option>
- <el-option label="寰呮姤宸�" value="2"></el-option>
- <el-option label="宸叉姤宸�" value="3"></el-option>
+ <el-select v-model="report.status" :placeholder="$t('reportmanage.cstate')" style="margin-left: 10px;" >
+ <el-option :label="$t('reportmanage.all')" value="0"></el-option>
+ <el-option :label="$t('reportmanage.dreportwork')" value="1"></el-option>
+ <el-option :label="$t('reportmanage.pendingwork')" value="2"></el-option>
+ <el-option :label="$t('reportmanage.reportwork')" value="3"></el-option>
</el-select>
- <el-select v-model="report.workingProcedure" placeholder="娓呴�夋嫨宸ュ簭" style="margin-left: 10px;" >
- <el-option label="鍏ㄩ儴" value="0"></el-option>
- <el-option label="鍒囧壊" value="1"></el-option>
- <el-option label="纾ㄨ竟" value="2"></el-option>
- <el-option label="閽㈠寲" value="3"></el-option>
+ <el-select v-model="report.workingProcedure" :placeholder="$t('reportmanage.cprocess')" style="margin-left: 10px;" >
+ <el-option :label="$t('reportmanage.all')" value="0"></el-option>
+ <el-option :label="$t('reportmanage.incise')" value="1"></el-option>
+ <el-option :label="$t('reportmanage.edging')" value="2"></el-option>
+ <el-option :label="$t('reportmanage.steel')" value="3"></el-option>
</el-select>
- <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">鏌ヨ</el-button>
- <el-button type="success" style="margin-left: 10px;" >鎶ュ伐</el-button>
+ <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('reportmanage.inquire') }}</el-button>
+ <el-button type="success" style="margin-left: 10px;" >{{ $t('reportmanage.signingwork') }}</el-button>
</div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="550" ref="table" :data="reportData"
+ <el-table height="540" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="teamsGroupsName" align="center" label="鎶ュ伐鐝粍" min-width="120" />
- <el-table-column prop="deviceName" align="center" label="鎶ュ伐璁惧" min-width="120" />
- <el-table-column prop="line" align="center" label="绾胯矾" min-width="120" />
- <el-table-column prop="workingProcedure" align="center" label="宸ュ簭" min-width="120" />
- <el-table-column prop="glassId" align="center" label="鐜荤拑id" min-width="120" />
- <el-table-column prop="engineerId" align="center" label="宸ョ▼鍙�" min-width="120" />
- <el-table-column prop="temperingLayoutId" align="center" label="閽㈠寲鐗堝浘id" min-width="120" />
- <el-table-column prop="damageTime" align="center" label="鐢熶骇鏃堕棿" min-width="120" />
- <el-table-column prop="type" align="center" label="绫诲瀷" min-width="120" />
- <el-table-column prop="status" align="center" label="鐘舵��" min-width="120" />
- <el-table-column prop="processId" align="center" label="娴佺▼鍗�" min-width="120" />
- <el-table-column prop="orderNumber" align="center" label="搴忓彿" min-width="120" />
- <el-table-column prop="technologyNumber" align="center" label="灞�" min-width="120" />
- <el-table-column prop="breakageType" align="center" label="鐮存崯绫诲瀷" min-width="120" />
- <el-table-column prop="breakageReason" align="center" label="鐮存崯鍘熷洜" min-width="120" />
- <el-table-column prop="responsibleProcess" align="center" label="璐ｄ换宸ュ簭" min-width="120" />
- <el-table-column prop="responsiblePersonnel" align="center" label="璐ｄ换浜哄憳" min-width="120" />
- <el-table-column prop="responsibleTeam" align="center" label="璐ｄ换鐝粍" min-width="120" />
- <el-table-column prop="responsibleEquipment" align="center" label="璐ｄ换璁惧" min-width="120" />
- <el-table-column prop="remark" align="center" label="澶囨敞" min-width="120" />
+ <el-table-column prop="teamsGroupsName" align="center" :label="$t('reportmanage.reporteam')" min-width="120" />
+ <el-table-column prop="deviceName" align="center" :label="$t('reportmanage.reportingequipment')" min-width="120" />
+ <el-table-column prop="line" align="center" :label="$t('reportmanage.line')" min-width="120" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="120" />
+ <el-table-column prop="glassId" align="center" :label="$t('reportmanage.glassID')" min-width="120" />
+ <el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="120" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')" min-width="120" />
+ <el-table-column prop="damageTime" align="center" :label="$t('reportmanage.productiontime')" min-width="120" />
+ <el-table-column prop="type" align="center" :label="$t('reportmanage.type')" min-width="120" />
+ <el-table-column prop="status" align="center" :label="$t('reportmanage.state')" min-width="120" />
+ <el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="120" />
+ <el-table-column prop="orderNumber" align="center" :label="$t('reportmanage.number')" min-width="120" />
+ <el-table-column prop="technologyNumber" align="center" :label="$t('reportmanage.layer')" min-width="120" />
+ <el-table-column prop="breakageType" align="center" :label="$t('reportmanage.typebreakage')" min-width="120" />
+ <el-table-column prop="breakageReason" align="center" :label="$t('reportmanage.causebreakage')" min-width="120" />
+ <el-table-column prop="responsibleProcess" align="center" :label="$t('reportmanage.responsibleprocess')" min-width="120" />
+ <el-table-column prop="responsiblePersonnel" align="center" :label="$t('reportmanage.responsiblepersonnel')" min-width="120" />
+ <el-table-column prop="responsibleTeam" align="center" :label="$t('reportmanage.responsibleteam')" min-width="120" />
+ <el-table-column prop="responsibleEquipment" align="center" :label="$t('reportmanage.responsibleequipment')" min-width="120" />
+ <el-table-column prop="remark" align="center" :label="$t('reportmanage.remark')" min-width="120" />
</el-table>
</div>
</el-card>
--
Gitblit v1.8.0