From e7cfe2a2c78e00f358c25170fd420745dedea52b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 26 十一月 2024 15:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectPlan/index.vue | 64 +-------------------------------
1 files changed, 2 insertions(+), 62 deletions(-)
diff --git a/src/views/project/plan/index.vue b/src/views/projectPlan/index.vue
similarity index 79%
rename from src/views/project/plan/index.vue
rename to src/views/projectPlan/index.vue
index 838134b..6ffcc71 100644
--- a/src/views/project/plan/index.vue
+++ b/src/views/projectPlan/index.vue
@@ -79,38 +79,6 @@
@click="handleReset"
>閲嶇疆</el-button>
</el-col>
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- plain-->
-<!-- icon="el-icon-edit"-->
-<!-- size="mini"-->
-<!-- :disabled="single"-->
-<!-- @click="handleUpdate"-->
-<!-- v-hasPermi="['plan:record:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="danger"-->
-<!-- plain-->
-<!-- icon="el-icon-delete"-->
-<!-- size="mini"-->
-<!-- :disabled="multiple"-->
-<!-- @click="handleDelete"-->
-<!-- v-hasPermi="['plan:record:remove']"-->
-<!-- >鍒犻櫎</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="warning"-->
-<!-- plain-->
-<!-- icon="el-icon-download"-->
-<!-- size="mini"-->
-<!-- @click="handleExport"-->
-<!-- v-hasPermi="['plan:record:export']"-->
-<!-- >瀵煎嚭</el-button>-->
-<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -217,39 +185,11 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
-<!-- <!– 娣诲姞鎴栦慨鏀归」鐩鍒掕褰曞璇濇 –>-->
-<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
-<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
-<!-- <el-form-item label="椤圭洰淇℃伅id" prop="projectInfoId">-->
-<!-- <el-input v-model="form.projectInfoId" placeholder="璇疯緭鍏ラ」鐩俊鎭痠d" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="椤圭洰璁″垝id" prop="planId">-->
-<!-- <el-input v-model="form.planId" placeholder="璇疯緭鍏ラ」鐩鍒抜d" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="宸ョ▼id" prop="engineeringInfoId">-->
-<!-- <el-input v-model="form.engineeringInfoId" placeholder="璇疯緭鍏ュ伐绋媔d" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="璁″垝鏈�" prop="planTime">-->
-<!-- <el-input v-model="form.planTime" placeholder="璇疯緭鍏ヨ鍒掓湡" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鏈堝害/瀛e害/骞村害 0/1/2" prop="planTimeFlag">-->
-<!-- <el-input v-model="form.planTimeFlag" placeholder="璇疯緭鍏ユ湀搴�/瀛e害/骞村害 0/1/2" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鎶曡祫" prop="actualInvest">-->
-<!-- <el-input v-model="form.actualInvest" placeholder="璇疯緭鍏ユ姇璧�" />-->
-<!-- </el-form-item>-->
-<!-- </el-form>-->
-<!-- <div slot="footer" class="dialog-footer">-->
-<!-- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>-->
-<!-- <el-button @click="cancel">鍙� 娑�</el-button>-->
-<!-- </div>-->
-<!-- </el-dialog>-->
</div>
</template>
<script>
-import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/project/plan/index";
+import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/projectPlan/index";
export default {
name: "index",
@@ -389,7 +329,7 @@
/** 鏌ョ湅椤圭洰璁″垝璁板綍 */
handlePlanRecord(row) {
this.$router.push({
- path: '/plan/planRecord',
+ path: '/projectPlan/planRecord',
query: {
data: JSON.stringify(row)
}
--
Gitblit v1.8.0