From ba61d95e7367745913a0c85d45416578d8d66e31 Mon Sep 17 00:00:00 2001 From: luohairen <3399054449@qq.com> Date: 星期二, 17 十二月 2024 17:47:11 +0800 Subject: [PATCH] 优化 --- src/views/projectManage/plan/planInfo.vue | 42 ++++++- src/views/projectManage/progress/progressRecord.vue | 94 +++++++++++++++--- src/views/projectManage/plan/planInfoCheck.vue | 38 +++++-- src/views/projectManage/plan/planRecord.vue | 103 +++++++++++++++++--- 4 files changed, 224 insertions(+), 53 deletions(-) diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue index b8451ad..b7cabf3 100644 --- a/src/views/projectManage/plan/planInfo.vue +++ b/src/views/projectManage/plan/planInfo.vue @@ -7,7 +7,13 @@ <el-card shadow="hover"> <el-row :gutter="20"> <el-col :span="24" class="mb-4"> - <el-button type="primary" size="small" @click="handleAdd" style="float: right; margin-bottom: 10px">鏂板</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-plus" + @click="handleAdd" + style="float: right; + margin-bottom: 10px">鏂板</el-button> <el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px"> <el-table-column prop="index" label="搴忓彿" width="50" align="center"> <template #default="scope"> @@ -24,14 +30,14 @@ <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" - size="small" + size="medium" style="width: 130px" value-format="yyyy-MM-dd HH:mm:ss"/> </template> </el-table-column> <el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" width="160" align="center"> <template #default="scope"> - <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" value-format="yyyy-MM-dd HH:mm:ss"/> + <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="medium" style="width: 130px" value-format="yyyy-MM-dd HH:mm:ss"/> </template> </el-table-column> <el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' " width="100" align="center"> @@ -41,9 +47,21 @@ </el-table-column> <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template #default="scope"> - <el-button size="small" @click="handleSave(scope.$index)">淇濆瓨</el-button> - <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button> - <el-button size="small" type="danger" @click="handleDelete(scope.$index)">鍒犻櫎</el-button> + <el-button + size="medium" + type="text" + icon="el-icon-check" + @click="handleSave(scope.$index)">淇濆瓨</el-button> + <el-button + size="medium" + type="text" + icon="el-icon-refresh-left" + @click="handleReset(scope.$index)">閲嶇疆</el-button> + <el-button + size="medium" + type="text" + icon="el-icon-delete" + @click="handleDelete(scope.$index)">鍒犻櫎</el-button> </template> </el-table-column> </el-table> @@ -61,8 +79,16 @@ </el-input> </div> <div style="display: flex; justify-content: center; align-items: center; margin-top: 20px"> - <el-button type="primary" size="small" @click="handleSubmit">涓婃姤</el-button> - <el-button type="primary" size="small" @click="handleResetAll">閲嶇疆</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-upload2" + @click="handleSubmit">涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-refresh-left" + @click="handleResetAll">閲嶇疆</el-button> </div> </el-col> </el-row> diff --git a/src/views/projectManage/plan/planInfoCheck.vue b/src/views/projectManage/plan/planInfoCheck.vue index 3aa6728..afd4ab9 100644 --- a/src/views/projectManage/plan/planInfoCheck.vue +++ b/src/views/projectManage/plan/planInfoCheck.vue @@ -26,7 +26,7 @@ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" - size="small" + size="medium" style="width: 130px" :readonly="projectInfoData.managerFlag"/> </template> @@ -38,7 +38,7 @@ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" - size="small" + size="medium" style="width: 130px" :readonly="projectInfoData.managerFlag" /> </template> @@ -58,12 +58,24 @@ <div v-if="scope.row.planStatus === 0"></div> <!-- 鐘舵�佷负宸查┏鍥� --> <div v-if="scope.row.planStatus === 1"> - <el-button size="small" @click="handleResubmit(scope.row)">閲嶆柊涓婃姤</el-button> - <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button> + <el-button + size="medium" + type="text" + icon="el-icon-upload2" + @click="handleResubmit(scope.row)">閲嶆柊涓婃姤</el-button> + <el-button + size="medium" + type="text" + icon="el-icon-refresh-left" + @click="handleReset(scope.$index)">閲嶇疆</el-button> </div> <!-- 鐘舵�佷负宸查�氳繃 --> <div v-if="scope.row.planStatus === 2"> - <el-button size="small" @click="handleDelay(scope.$index)">寤舵湡</el-button> + <el-button + size="medium" + type="text" + icon="el-icon-edit" + @click="handleDelay(scope.$index)">寤舵湡</el-button> </div> </template> </el-table-column> @@ -102,7 +114,7 @@ v-model="scope.row.departmentExamine" :disabled="scope.row.planStatus === 2 || scope.row.planStatus === 1" placeholder="璇烽�夋嫨" - size="small" + size="medium" clearable> <el-option label="鍚屾剰" :value="0"></el-option> <el-option label="椹冲洖" :value="1"></el-option> @@ -143,7 +155,7 @@ v-model="scope.row.manageExamine" :disabled="scope.row.planStatus === 2 || scope.row.planStatus === 1" placeholder="璇烽�夋嫨" - size="small" + size="medium" clearable> <el-option label="鍚屾剰" :value="0"></el-option> <el-option label="椹冲洖" :value="1"></el-option> @@ -180,18 +192,22 @@ <template #default="scope"> <div v-if="!projectInfoData.managerFlag"> <el-button - size="small" + size="medium" + type="text" + icon="el-icon-reply" @click="handleReply(scope.$index)" :disabled="scope.row.planStatus === 0">鍥炲</el-button> <el-button - size="small" - type="danger" + size="medium" + type="text" + icon="el-icon-refresh-left" @click="handleReset(scope.$index)" :disabled="scope.row.planStatus === 0">閲嶇疆</el-button> </div> <div v-if="projectInfoData.managerFlag"> <el-button - size="small" + size="medium" + type="text" @click="handleExamine(scope.$index)" v-if="scope.row.planStatus === 0">瀹℃牳</el-button> </div> diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue index ab0b9ba..cf6401e 100644 --- a/src/views/projectManage/plan/planRecord.vue +++ b/src/views/projectManage/plan/planRecord.vue @@ -9,7 +9,13 @@ <el-col :span="24" class="mb-4"> <div style="margin-bottom: 10px"> <span style="font-size: 20px; font-weight: bold;">鏈堝害璁″垝</span> - <el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-plus" + style="float: right" + @click="handleAddMonthPlan" + v-show="!projectInfoData.managerFlag">鏂板</el-button> </div> <el-table :data="monthRecords" border stripe style="width: 100%; margin-bottom: 20px"> <!-- 琛ㄥご --> @@ -27,12 +33,27 @@ <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template slot-scope="scope"> <div v-show="!projectInfoData.managerFlag"> - <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button> - <el-button type="danger" size="small" v-show="scope.row.reportStatus === 1" @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button> - <el-button type="danger" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-edit" + :disabled="scope.row.reportStatus === 0" + @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-delete" + v-show="scope.row.reportStatus === 1" + @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button> + <el-button type="text" size="medium" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> </div> <div v-show="projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-show="scope.row.reportStatus === 0" + @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> </div> </template> </el-table-column> @@ -41,7 +62,13 @@ <el-col :span="24" class="mb-4" style="margin-top: 20px"> <div style="margin-bottom: 10px"> <span style="font-size: 20px; font-weight: bold;">瀛e害璁″垝</span> - <el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-plus" + style="float: right" + @click="handleAddSeasonPlan" + v-show="!projectInfoData.managerFlag">鏂板</el-button> </div> <el-table :data="seasonRecords" border stripe style="width: 100%; margin-bottom: 20px"> <!-- 琛ㄥご --> @@ -59,12 +86,32 @@ <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template slot-scope="scope"> <div v-show="!projectInfoData.managerFlag"> - <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button> - <el-button type="danger" size="small" v-show="scope.row.reportStatus === 1" @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button> - <el-button type="danger" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-edit" + :disabled="scope.row.reportStatus === 0" + @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-delete" + v-show="scope.row.reportStatus === 1" + @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-show="scope.row.reportStatus === 0" + @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> </div> <div v-show="projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-show="scope.row.reportStatus === 0" + @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> </div> </template> </el-table-column> @@ -73,7 +120,13 @@ <el-col :span="24" class="mb-4" style="margin-top: 20px"> <div style="margin-bottom: 10px"> <span style="font-size: 20px; font-weight: bold;">骞村害璁″垝</span> - <el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-plus" + style="float: right" + @click="handleAddYearPlan" + v-show="!projectInfoData.managerFlag">鏂板</el-button> </div> <el-table :data="yearRecords" border stripe style="width: 100%; margin-bottom: 20px"> <!-- 琛ㄥご --> @@ -91,12 +144,32 @@ <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template slot-scope="scope"> <div v-show="!projectInfoData.managerFlag"> - <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button> - <el-button type="danger" size="small" v-show="scope.row.reportStatus === 1" @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button> - <el-button type="danger" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-edit" + :disabled="scope.row.reportStatus === 0" + @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-delete" + v-show="scope.row.reportStatus === 1" + @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-show="scope.row.reportStatus === 0" + @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> </div> <div v-show="projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-show="scope.row.reportStatus === 0" + @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button> </div> </template> </el-table-column> diff --git a/src/views/projectManage/progress/progressRecord.vue b/src/views/projectManage/progress/progressRecord.vue index afecc29..0cdb3a4 100644 --- a/src/views/projectManage/progress/progressRecord.vue +++ b/src/views/projectManage/progress/progressRecord.vue @@ -32,13 +32,35 @@ <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template slot-scope="scope"> <div v-if="!projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 0" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2" @click="handleReportAgain(scope.row)">閲嶆柊涓婃姤</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus !== 0" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 0" + @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 2" + @click="handleReportAgain(scope.row)">閲嶆柊涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-if="scope.row.progressStatus !== 0" + @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> </div> <div v-if="projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 1" @click="handleOpenExamine(scope.row)">瀹℃牳</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2 || scope.row.progressStatus === 3" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 1" + @click="handleOpenExamine(scope.row)">瀹℃牳</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-if="scope.row.progressStatus === 2 || scope.row.progressStatus === 3" + @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> </div> </template> </el-table-column> @@ -67,12 +89,29 @@ <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template slot-scope="scope"> <div v-if="!projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 0" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2" @click="handleReportAgain(scope.row)">閲嶆柊涓婃姤</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus !== 0" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 0" + @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 2" + @click="handleReportAgain(scope.row)">閲嶆柊涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-if="scope.row.progressStatus !== 0" + @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> </div> <div v-if="projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 1" @click="handleOpenExamine(scope.row)">瀹℃牳</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 1" + @click="handleOpenExamine(scope.row)">瀹℃牳</el-button> </div> </template> </el-table-column> @@ -101,12 +140,29 @@ <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template slot-scope="scope"> <div v-if="!projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 0" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 2" @click="handleReportAgain(scope.row)">閲嶆柊涓婃姤</el-button> - <el-button type="primary" size="small" v-if="scope.row.progressStatus !== 0" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 0" + @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 2" + @click="handleReportAgain(scope.row)">閲嶆柊涓婃姤</el-button> + <el-button + type="text" + size="medium" + icon="el-icon-view" + v-if="scope.row.progressStatus !== 0" + @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button> </div> <div v-if="projectInfoData.managerFlag"> - <el-button type="primary" size="small" v-if="scope.row.progressStatus === 1" @click="handleOpenExamine(scope.row)">瀹℃牳</el-button> + <el-button + type="text" + size="medium" + v-if="scope.row.progressStatus === 1" + @click="handleOpenExamine(scope.row)">瀹℃牳</el-button> </div> </template> </el-table-column> @@ -151,9 +207,9 @@ <el-input v-model="progressReportData.title" readonly /> </el-form-item> <el-form-item label="璁″垝鏃堕棿锛�" :label-width="formLabelWidth"> - <el-date-picker v-model="progressReportData.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" readonly/> + <el-date-picker v-model="progressReportData.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="medium" style="width: 130px" readonly/> 鑷� - <el-date-picker v-model="progressReportData.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" readonly/> + <el-date-picker v-model="progressReportData.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="medium" style="width: 130px" readonly/> </el-form-item> <el-form-item label="瀹為檯瀹屾垚鏃堕棿锛�" :label-width="formLabelWidth"> <el-date-picker @@ -161,7 +217,7 @@ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" - size="small" + size="medium" style="width: 130px" :readonly="projectInfoData.managerFlag || dialogFlag !== 0"/> 鑷� @@ -170,7 +226,7 @@ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" - size="small" + size="medium" style="width: 130px" :readonly="projectInfoData.managerFlag || dialogFlag !== 0"/> </el-form-item> @@ -204,7 +260,7 @@ <el-select v-model="progressReportData.departmentExamine" placeholder="璇烽�夋嫨" - size="small" + size="medium" :disabled="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3" clearable> <el-option label="鍚屾剰" :value="0"></el-option> @@ -251,7 +307,7 @@ <el-select v-model="progressReportData.manageExamine" placeholder="璇烽�夋嫨" - size="small" + size="medium" :disabled="progressReportData.progressStatusInt === 2 || progressReportData.progressStatusInt === 3" clearable> <el-option label="璇烽�夋嫨" :value="null"></el-option> -- Gitblit v1.8.0