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/progress/index.vue | 190 ++++++++++++++---------------------------------
1 files changed, 58 insertions(+), 132 deletions(-)
diff --git a/src/views/projectManage/progress/index.vue b/src/views/projectManage/progress/index.vue
index 514064a..35ffa83 100644
--- a/src/views/projectManage/progress/index.vue
+++ b/src/views/projectManage/progress/index.vue
@@ -23,30 +23,22 @@
<el-option label="鏈笂鎶�" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="瀹℃壒鐘舵��" prop="reportStatus">
- <el-select placeholder="璇烽�夋嫨鐘舵��" clearable>
- <el-option label="宸插鎵�" value="0"></el-option>
- <el-option label="鏈鎵�" value="1"></el-option>
+ <el-form-item label="骞村害" prop="reportStatus">
+ <el-select v-model="queryParams.yearStatus" @change="handleQuery" placeholder="璇烽�夋嫨骞村害" clearable>
+ <el-option label="宸蹭笂鎶�" value="0"></el-option>
+ <el-option label="鏈笂鎶�" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="椤圭洰骞撮檺" prop="reportStatus">
- <el-select placeholder="涓嬫媺閫夋嫨" clearable>
- <el-option label="2024" value="2024"></el-option>
- <el-option label="2025" value="2025"></el-option>
+ <el-form-item label="瀛ｅ害" prop="reportStatus">
+ <el-select v-model="queryParams.seasonStatus" @change="handleQuery" placeholder="璇烽�夋嫨瀛ｅ害" clearable>
+ <el-option label="宸蹭笂鎶�" value="0"></el-option>
+ <el-option label="鏈笂鎶�" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="椤圭洰鏈堝害" prop="reportStatus">
- <el-select placeholder="涓嬫媺閫夋嫨" clearable>
- <el-option label="1鏈堝害" value="1"></el-option>
- <el-option label="2鏈堝害" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="椤圭洰瀛ｅ害" prop="reportStatus">
- <el-select placeholder="涓嬫媺閫夋嫨" clearable>
- <el-option label="1瀛ｅ害" value="1"></el-option>
- <el-option label="2瀛ｅ害" value="2"></el-option>
- <el-option label="3瀛ｅ害" value="3"></el-option>
- <el-option label="4瀛ｅ害" value="4"></el-option>
+ <el-form-item label="鏈堝害" prop="reportStatus">
+ <el-select v-model="queryParams.monthStatus" @change="handleQuery" placeholder="璇烽�夋嫨鏈堝害" clearable>
+ <el-option label="宸蹭笂鎶�" value="0"></el-option>
+ <el-option label="鏈笂鎶�" value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -56,16 +48,7 @@
<el-button
type="primary"
plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
+ icon="el-icon-search"
size="mini"
@click="handleQuery"
>鏌ヨ</el-button>
@@ -74,7 +57,7 @@
<el-button
type="primary"
plain
- icon="el-icon-plus"
+ icon="el-icon-refresh"
size="mini"
@click="handleReset"
>閲嶇疆</el-button>
@@ -91,32 +74,14 @@
{{ scope.row.reportStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
</template>
</el-table-column>
- <el-table-column label="椤圭洰鐮�" align="center" prop="" />
+ <el-table-column label="椤圭洰鐮�" align="center" prop="coding">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="scope.row.coding === 'green'">缁�</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="椤圭洰浠ｇ爜" align="center" prop="projectCode" />
- <el-table-column label="椤圭洰绫诲瀷" align="center" prop="projectType" >
- <template slot-scope="scope">
- {{
- scope.row.projectType === 0 ? '鎴垮眿寤虹瓚' :
- scope.row.projectType === 1 ? '鍩庡競鍩虹璁炬柦' :
- scope.row.projectType === 2 ? '浜ら�氳繍杈�' :
- scope.row.projectType === 3 ? '姘村埄' :
- scope.row.projectType === 4 ? '鑳芥簮' :
- scope.row.projectType === 5 ? '闈炵叅鐭垮北' :
- scope.row.projectType === 6 ? '鍏朵粬' : '鏈煡'
- }}
- </template>
- </el-table-column>
- <el-table-column label="椤圭洰闃舵" align="center" prop="projectPhase" >
- <template slot-scope="scope">
- {{
- scope.row.projectPhase === 0 ? '鍌ㄥ瑙勫垝闃舵' :
- scope.row.projectPhase === 1 ? '椤圭洰鍓嶆湡闃舵' :
- scope.row.projectPhase === 2 ? '瀹炴柦闃舵' :
- scope.row.projectPhase === 3 ? '绔ｅ伐鎶曠敤闃舵' :
- '鏈煡'
- }}
- </template>
- </el-table-column>
+ <el-table-column label="椤圭洰绫诲瀷" align="center" prop="projectType" />
+ <el-table-column label="椤圭洰闃舵" align="center" prop="projectPhase" />
<el-table-column label="鏈堝害" align="center" prop="monthStatus" >
<template slot-scope="scope">
{{ scope.row.monthStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
@@ -132,26 +97,21 @@
{{ scope.row.yearStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
</template>
</el-table-column>
- <el-table-column label="椤圭洰鐘舵��" align="center" prop="projectStatus" >
- <template slot-scope="scope">
- {{
- scope.row.projectStatus === 0 ? '鏈紑宸�' :
- scope.row.projectStatus === 1 ? '宸插紑宸�' :
- scope.row.projectStatus === 2 ? '宸茬宸�' :
- scope.row.projectStatus === 3 ? '鏆傚仠' :
- '鏈煡鐘舵��'
- }}
- </template>
- </el-table-column>
+ <el-table-column label="椤圭洰鐘舵��" align="center" prop="projectStatus" />
<el-table-column label="鎶曡祫绫诲埆" align="center" prop="investType" >
<template slot-scope="scope">
{{
- scope.row.investType === 0 ? '浼佷笟鎶曡祫' :
- scope.row.investType === 1 ? '鏀垮簻鎶曡祫' :
- scope.row.investType === 2 ? '澶栧晢鎶曡祫' :
- scope.row.investType === 3 ? '澧冨鎶曡祫' :
+ scope.row.investType === 'enterprise_investment' ? '浼佷笟鎶曡祫' :
+ scope.row.investType === 'government_investment' ? '鏀垮簻鎶曡祫' :
+ scope.row.investType === 'foreign_investment' ? '澶栧晢鎶曡祫' :
+ scope.row.investType === 'abroad_investment' ? '澧冨鎶曡祫' :
'鏈煡绫诲瀷'
}}
+ </template>
+ </el-table-column>
+ <el-table-column label="寮傚父闂" align="center" prop="exception" >
+ <template slot-scope="scope">
+ {{ scope.row.exception === 0 ? '璁″垝瓒呮湡' : scope.row.exception === 1 ? '杩涘害瓒呮湡' : '' }}
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -161,19 +121,7 @@
type="text"
icon="el-icon-edit"
@click="handlePlanRecord(scope.row)"
- >鏌ョ湅</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
+ >缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
@@ -181,7 +129,7 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageNum"
+ :page.sync="queryParams.currentPage"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@@ -189,7 +137,7 @@
</template>
<script>
-import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/projectPlan/index";
+import { getList, getManagerFlag } from "@/api/projectPlan/index";
export default {
name: "Index",
@@ -215,7 +163,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ currentPage: 1,
pageSize: 10,
},
// 琛ㄥ崟鍙傛暟
@@ -280,46 +228,7 @@
this.open = true;
this.title = "娣诲姞椤圭洰璁″垝璁板綍";
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getRecord(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼椤圭洰璁″垝璁板綍";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateRecord(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addRecord(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰璁″垝璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delRecord(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('plan/record/export', {
@@ -328,12 +237,29 @@
},
/** 鏌ョ湅椤圭洰璁″垝璁板綍 */
handlePlanRecord(row) {
- this.$router.push({
- path: '/projectManage/progressRecord',
- query: {
- data: JSON.stringify(row)
- }
+ // 鑾峰緱涓荤鏍囧織
+ getManagerFlag(row.id).then(res => {
+ this.managerFlag = res.data;
+ row.managerFlag = this.managerFlag;
+ this.$router.push({
+ path: '/projectManage/progressRecord',
+ query: {
+ data: JSON.stringify(row),
+ // id: row.id,
+ // projectName: row.projectName,
+ // projectCode: row.projectCode,
+ // managerFlag: row.managerFlag
+ }
+ })
})
+ },
+ /** 閲嶇疆鎸夐挳 */
+ handleReset() {
+ this.queryParams = {
+ currentPage: 1,
+ pageSize: 10,
+ }
+ this.getList();
}
}
};
--
Gitblit v1.8.0