From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 25 三月 2025 11:31:04 +0800 Subject: [PATCH] Merge branch 'dev' --- src/views/projectManage/plan/planInfoCheck.vue | 187 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 139 insertions(+), 48 deletions(-) diff --git a/src/views/projectManage/plan/planInfoCheck.vue b/src/views/projectManage/plan/planInfoCheck.vue index 0a3ed72..afd4ab9 100644 --- a/src/views/projectManage/plan/planInfoCheck.vue +++ b/src/views/projectManage/plan/planInfoCheck.vue @@ -7,7 +7,6 @@ <el-card shadow="hover"> <el-row :gutter="20"> <el-col :span="24" class="mb-4"> - <el-button type="primary" size="small" @click="handlePlanRecord" 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"> @@ -17,29 +16,67 @@ </el-table-column> <el-table-column prop="taskName" label="浜嬮」鍚嶇О" width="500" align="center"> <template #default="scope"> - <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" readonly /> + <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" :readonly="scope.row.planStatus !== 1" /> </template> </el-table-column> <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" width="160" align="center" > <template #default="scope"> - <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" :readonly="projectInfoData.managerFlag"/> + <el-date-picker + v-model="scope.row.startTime" + type="date" + placeholder="閫夋嫨鏃ユ湡" + value-format="yyyy-MM-dd HH:mm:ss" + size="medium" + style="width: 130px" + :readonly="projectInfoData.managerFlag"/> </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" :readonly="projectInfoData.managerFlag" /> + <el-date-picker + v-model="scope.row.endTime" + type="date" + placeholder="閫夋嫨鏃ユ湡" + value-format="yyyy-MM-dd HH:mm:ss" + size="medium" + style="width: 130px" + :readonly="projectInfoData.managerFlag" /> </template> </el-table-column> <el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' " align="center"> + {{ planInfoData.planTime }}{{ planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' }} + </el-table-column> + <el-table-column prop="planStatus" label="鐘舵��" width="100" align="center"> <template #default="scope"> - <span>{{ planInfoData.planTime }}{{ planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' }}</span> + {{ scope.row.planStatus === 1 ? '宸查┏鍥�' : scope.row.planStatus === 2 ? '宸查�氳繃' : '鏈鏍�' }} </template> </el-table-column> <div v-if="!projectInfoData.managerFlag"> <el-table-column fixed="right" label="鎿嶄綔" align="center"> <template #default="scope"> - <el-button size="small" @click="handleDelay(scope.$index)">寤舵湡</el-button> - <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button> + <!-- 鐘舵�佷负鏈鏍� --> + <div v-if="scope.row.planStatus === 0"></div> + <!-- 鐘舵�佷负宸查┏鍥� --> + <div v-if="scope.row.planStatus === 1"> + <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="medium" + type="text" + icon="el-icon-edit" + @click="handleDelay(scope.$index)">寤舵湡</el-button> + </div> </template> </el-table-column> </div> @@ -71,54 +108,109 @@ </el-table-column> <el-table-column prop="title" label="浜嬮」鍚嶇О" width="200" align="center" /> <el-table-column prop="departmentExamine" label="涓婄骇瀹℃牳" width="130" align="center"> - <template #default="scope" v-if="!projectInfoData.managerFlag"> - {{ scope.row.departmentExamine === 0 ? '鍚屾剰' : scope.row.departmentExamine === 1 ? '椹冲洖' : '鏈鏍�' }} - </template> - <template v-if="projectInfoData.managerFlag" #default="scope"> - <el-select v-model="scope.row.departmentExamine" placeholder="璇烽�夋嫨" size="small" clearable> - <el-option label="鍚屾剰" :value="0"></el-option> - <el-option label="椹冲洖" :value="1"></el-option> - </el-select> + <template #default="scope"> + <div v-if="projectInfoData.managerFlag"> + <el-select + v-model="scope.row.departmentExamine" + :disabled="scope.row.planStatus === 2 || scope.row.planStatus === 1" + placeholder="璇烽�夋嫨" + size="medium" + clearable> + <el-option label="鍚屾剰" :value="0"></el-option> + <el-option label="椹冲洖" :value="1"></el-option> + </el-select> + </div> + <div v-if="!projectInfoData.managerFlag"> + {{ scope.row.departmentExamine === 0 ? '鍚屾剰' : scope.row.departmentExamine === 1 ? '椹冲洖' : '鏈鏍�' }} + </div> </template> </el-table-column> <el-table-column prop="departmentApproval" label="鎵瑰鍐呭" width="160" align="center"> <template v-if="projectInfoData.managerFlag" #default="scope"> - <el-input type="textarea" v-model="scope.row.departmentApproval" placeholder="璇疯緭鍏�" rows="3" /> + <el-input + type="textarea" + v-model="scope.row.departmentApproval" + :readonly="scope.row.planStatus === 2 || scope.row.planStatus === 1" + placeholder="璇疯緭鍏�" + rows="3" /> </template> </el-table-column> <el-table-column prop="departmentApprovalReply" label="鎵瑰鍥炲" width="160" align="center"> <template #default="scope" v-if="!projectInfoData.managerFlag"> - <el-input type="textarea" v-model="scope.row.departmentApprovalReply" placeholder="璇疯緭鍏�" rows="3" /> + <el-input + type="textarea" + v-model="scope.row.departmentApprovalReply" + :readonly="scope.row.planStatus === 0" + placeholder="璇疯緭鍏�" + rows="3" /> </template> </el-table-column> <el-table-column prop="manageExamine" label="涓荤閮ㄩ棬瀹℃牳" width="130" align="center" > - <template #default="scope" v-if="!projectInfoData.managerFlag"> - {{ scope.row.manageExamine === 0 ? '鍚屾剰' : scope.row.manageExamine === 1 ? '椹冲洖' : '鏈鏍�' }} - </template> - <template v-if="projectInfoData.managerFlag" #default="scope"> - <el-select v-model="scope.row.manageExamine" placeholder="璇烽�夋嫨" size="small" clearable> - <el-option label="鍚屾剰" :value="0"></el-option> - <el-option label="椹冲洖" :value="1"></el-option> - </el-select> + <template #default="scope"> + <div v-if="!projectInfoData.managerFlag"> + {{ scope.row.manageExamine === 0 ? '鍚屾剰' : scope.row.manageExamine === 1 ? '椹冲洖' : '鏈鏍�' }} + </div> + <div v-if="projectInfoData.managerFlag"> + <el-select + v-model="scope.row.manageExamine" + :disabled="scope.row.planStatus === 2 || scope.row.planStatus === 1" + placeholder="璇烽�夋嫨" + size="medium" + clearable> + <el-option label="鍚屾剰" :value="0"></el-option> + <el-option label="椹冲洖" :value="1"></el-option> + </el-select> + </div> </template> </el-table-column> <el-table-column prop="manageApproval" label="鎵瑰鍐呭" width="160" align="center"> <template v-if="projectInfoData.managerFlag" #default="scope"> - <el-input type="textarea" v-model="scope.row.manageApproval" placeholder="璇疯緭鍏�" rows="3" /> + <el-input + type="textarea" + v-model="scope.row.manageApproval" + :readonly="scope.row.planStatus === 2 || scope.row.planStatus === 1" + placeholder="璇疯緭鍏�" + rows="3" /> </template> </el-table-column> <el-table-column prop="manageApprovalReply" label="鎵瑰鍥炲" width="160" align="center"> <template #default="scope" v-if="!projectInfoData.managerFlag"> - <el-input type="textarea" v-model="scope.row.manageApprovalReply" placeholder="璇疯緭鍏�" rows="3" /> + <el-input + type="textarea" + v-model="scope.row.manageApprovalReply" + :readonly="scope.row.planStatus === 0" + placeholder="璇疯緭鍏�" + rows="3" /> </template> </el-table-column> - <el-table-column fixed="right" label="鎿嶄綔" align="center"> - <template #default="scope" v-if="!projectInfoData.managerFlag"> - <el-button size="small" @click="handleReply(scope.$index)">鍥炲</el-button> - <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button> + <el-table-column prop="planStatus" label="鐘舵��" width="200" align="center" > + <template #default="scope"> + {{ scope.row.planStatus === 1 ? '宸查┏鍥�' : scope.row.planStatus === 2 ? '宸查�氳繃' : '鏈鏍�' }} </template> - <template v-if="projectInfoData.managerFlag" #default="scope"> - <el-button size="small" @click="handleSave(scope.$index)">淇濆瓨</el-button> + </el-table-column> + <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200"> + <template #default="scope"> + <div v-if="!projectInfoData.managerFlag"> + <el-button + size="medium" + type="text" + icon="el-icon-reply" + @click="handleReply(scope.$index)" + :disabled="scope.row.planStatus === 0">鍥炲</el-button> + <el-button + 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="medium" + type="text" + @click="handleExamine(scope.$index)" + v-if="scope.row.planStatus === 0">瀹℃牳</el-button> + </div> </template> </el-table-column> </el-table> @@ -160,10 +252,10 @@ </template> <script> -import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyExamine, saveExamine } from "@/api/projectPlan/index"; +import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyExamine, saveExamine, resubmitPlanInfo } from "@/api/projectPlan/index"; export default { - name: "PlanInfoCheck", + name: "planInfoCheck", data() { return { loading: true, @@ -203,8 +295,8 @@ // 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏 getPlanRecordData() { // 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁 - this.planInfoData = this.$route.query.data - this.projectInfoData = this.$route.query.projectInfoData + this.projectInfoData = JSON.parse(this.$route.query.projectInfoData) + this.planInfoData = JSON.parse(this.$route.query.data) this.search(); }, // 鑾峰彇椤圭洰璁″垝椤� @@ -216,6 +308,13 @@ } else { this.tableData = response.data.list; } + }); + }, + // 鐢ㄦ埛閲嶆柊涓婃姤璁″垝椤� + handleResubmit(data) { + resubmitPlanInfo(data).then(response => { + this.$message.success('閲嶆柊涓婃姤鎴愬姛'); + this.search() }); }, // 寤舵湡 @@ -239,9 +338,10 @@ }); }, // 淇濆瓨瀹℃壒 - handleSave(index) { + handleExamine(index) { saveExamine(this.departmentApprovalData[index]).then(response => { - this.$message.success('淇濆瓨鎴愬姛'); + this.$message.success('瀹℃壒鎴愬姛'); + this.search() }); }, // 鑾峰彇璁″垝鏃ュ織 @@ -256,15 +356,6 @@ this.tableData[index].startTime = ''; this.tableData[index].endTime = ''; }, - /** 杩斿洖椤圭洰璁″垝璁板綍 */ - handlePlanRecord() { - this.$router.push({ - path: '/projectManage/planRecord', - query: { - data: this.projectInfoData - } - }) - } }, created() { this.getPlanRecordData(); -- Gitblit v1.8.0