From b87174cde67aaa8420ea492af9b79fcc9a692036 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:05 +0800
Subject: [PATCH] bug
---
src/views/projectManage/plan/planInfo.vue | 14 +
src/views/projectManage/progress/progressRecord.vue | 15 +
src/views/projectManage/plan/index.vue | 128 ++++++--------------
src/views/projectManage/plan/planInfoCheck.vue | 26 +++
src/views/projectManage/progress/index.vue | 129 +++++++--------------
src/views/projectManage/plan/planRecord.vue | 27 +++-
6 files changed, 144 insertions(+), 195 deletions(-)
diff --git a/src/views/projectManage/plan/index.vue b/src/views/projectManage/plan/index.vue
index b4b6913..16a8ffc 100644
--- a/src/views/projectManage/plan/index.vue
+++ b/src/views/projectManage/plan/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="projectColorCode">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="scope.row.projectColorCode === '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,24 +97,14 @@
{{ 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>
@@ -161,19 +116,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 +124,7 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageNum"
+ :page.sync="queryParams.currentPage"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@@ -217,7 +160,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ currentPage: 1,
pageSize: 10,
},
// 琛ㄥ崟鍙傛暟
@@ -297,10 +240,21 @@
this.$router.push({
path: '/projectManage/planRecord',
query: {
- data: row
+ id: row.id,
+ projectName: row.projectName,
+ projectCode: row.projectCode,
+ managerFlag: row.managerFlag
}
})
})
+ },
+ /** 閲嶇疆鎸夐挳 */
+ handleReset() {
+ this.queryParams = {
+ currentPage: 1,
+ pageSize: 10,
+ }
+ this.getList();
}
}
};
diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index 54012b5..310c175 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -101,7 +101,9 @@
}
}
},
-
+ created() {
+ this.getProjectInfoData();
+ },
methods: {
// 椤甸潰鍔犺浇
search() {
@@ -111,7 +113,12 @@
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
this.projectInfoData = this.$route.query.projectInfoData
- this.planInfoData = this.$route.query.data
+ this.planInfoData.id = this.$route.query.id;
+ this.planInfoData.projectName = this.$route.query.projectName;
+ this.planInfoData.projectCode = this.$route.query.projectCode;
+ this.planInfoData.planTime = this.$route.query.planTime;
+ this.planInfoData.planTimeFlag = this.$route.query.planTimeFlag;
+ this.planInfoData.managerFlag = this.$route.query.managerFlag;
this.search();
},
// 鑾峰彇椤圭洰璁″垝椤�
@@ -179,9 +186,6 @@
}
})
}
- },
- created() {
- this.getProjectInfoData();
},
};
</script>
diff --git a/src/views/projectManage/plan/planInfoCheck.vue b/src/views/projectManage/plan/planInfoCheck.vue
index 6fcd2cd..dd9d690 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; margin-left: 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">
@@ -22,12 +21,26 @@
</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="small"
+ 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="small"
+ style="width: 130px"
+ :readonly="projectInfoData.managerFlag" />
</template>
</el-table-column>
<el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " align="center">
@@ -266,8 +279,13 @@
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanRecordData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- this.planInfoData = this.$route.query.data
this.projectInfoData = this.$route.query.projectInfoData
+ this.planInfoData.id = this.$route.query.id;
+ this.planInfoData.projectName = this.$route.query.projectName;
+ this.planInfoData.projectCode = this.$route.query.projectCode;
+ this.planInfoData.planTime = this.$route.query.planTime;
+ this.planInfoData.planTimeFlag = this.$route.query.planTimeFlag;
+ this.planInfoData.managerFlag = this.$route.query.managerFlag;
this.search();
},
// 鑾峰彇椤圭洰璁″垝椤�
diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue
index ed81999..ad63175 100644
--- a/src/views/projectManage/plan/planRecord.vue
+++ b/src/views/projectManage/plan/planRecord.vue
@@ -126,16 +126,22 @@
yearRecords: [],
}
},
+ created() {
+ this.getProjectInfoData();
+ },
methods: {
// 椤甸潰鍔犺浇
search() {
this.getPlanRecordData(this.projectInfoData.id);
- console.log(this.projectInfoData);
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- this.projectInfoData = this.$route.query.data
+ this.projectInfoData.id = this.$route.query.id;
+ this.projectInfoData.projectName = this.$route.query.projectName;
+ this.projectInfoData.projectCode = this.$route.query.projectCode;
+ this.projectInfoData.managerFlag = this.$route.query.managerFlag;
+ // 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
this.search();
},
// 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
@@ -207,7 +213,12 @@
this.$router.push({
path: '/projectManage/planInfo',
query: {
- data: row,
+ id: row.id,
+ projectName: row.projectName,
+ projectCode: row.projectCode,
+ planTime: row.planTime,
+ planTimeFlag: row.planTimeFlag,
+ managerFlag: row.managerFlag,
projectInfoData: this.projectInfoData
}
})
@@ -223,14 +234,16 @@
this.$router.push({
path: '/projectManage/planInfoCheck',
query: {
- data: row,
+ id: row.id,
+ projectName: row.projectName,
+ projectCode: row.projectCode,
+ planTime: row.planTime,
+ planTimeFlag: row.planTimeFlag,
+ managerFlag: row.managerFlag,
projectInfoData: this.projectInfoData
}
})
}
- },
- created() {
- this.getProjectInfoData();
},
};
</script>
diff --git a/src/views/projectManage/progress/index.vue b/src/views/projectManage/progress/index.vue
index 1e85d12..b077bc5 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="projectColorCode">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="scope.row.projectColorCode === '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,24 +97,14 @@
{{ 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>
@@ -161,19 +116,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 +124,7 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageNum"
+ :page.sync="queryParams.currentPage"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@@ -215,7 +158,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ currentPage: 1,
pageSize: 10,
},
// 琛ㄥ崟鍙傛暟
@@ -296,10 +239,22 @@
this.$router.push({
path: '/projectManage/progressRecord',
query: {
- data: row
+ 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();
}
}
};
diff --git a/src/views/projectManage/progress/progressRecord.vue b/src/views/projectManage/progress/progressRecord.vue
index a7fafb1..fa478ff 100644
--- a/src/views/projectManage/progress/progressRecord.vue
+++ b/src/views/projectManage/progress/progressRecord.vue
@@ -153,6 +153,7 @@
v-model="progressReportData.actualStartTime"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
size="small"
style="width: 130px"
:readonly="projectInfoData.managerFlag || dialogFlag !== 0"/>
@@ -161,6 +162,7 @@
v-model="progressReportData.actualEndTime"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
size="small"
style="width: 130px"
:readonly="projectInfoData.managerFlag || dialogFlag !== 0"/>
@@ -339,15 +341,19 @@
accept: ['pdf','jpg','mp4'],
}
},
+ created() {
+ this.getProjectInfoData()
+ },
methods: {
search() {
this.getProjectProgressForm(this.projectInfoData.id);
this.getProgressInfoList(this.projectInfoData.id);
+ this.progressReportData = {};
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- this.projectInfoData = this.$route.query.data;
+ this.projectInfoData = JSON.parse(this.$route.query.data);
this.search();
},
getProjectProgressForm(id) {
@@ -391,7 +397,7 @@
// 鍥炲
handleReply() {
reply(this.progressReportData).then(res => {
- // this.dialogFormVisible = false;
+ this.dialogFormVisible = false;
this.$message.success('鍥炲鎴愬姛');
this.search();
})
@@ -425,6 +431,7 @@
this.dialogFormVisible = false;
this.isShowReplyBtn = true;
this.dialogFlag = 0;
+ this.progressReportData = {};
},
// 淇濆瓨
handleSave() {
@@ -436,9 +443,7 @@
})
}
},
- created() {
- this.getProjectInfoData()
- },
+
};
</script>
--
Gitblit v1.8.0