From fabe25575a7b8c8d4bef61c4ef4deaa7dc219cfe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 01:20:00 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/engineering/index.vue | 124 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 46 deletions(-)
diff --git a/src/views/engineering/index.vue b/src/views/engineering/index.vue
index 808b6c7..f0221c6 100644
--- a/src/views/engineering/index.vue
+++ b/src/views/engineering/index.vue
@@ -58,54 +58,54 @@
v-hasPermi="['code:engineering:add']"
>鏂板</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="['code:engineering:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="deleteByIds"
- v-hasPermi="['code:engineering: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="['code:engineering:export']"
- >瀵煎嚭</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="['code:engineering:edit']"-->
+<!-- >淇敼</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- icon="el-icon-delete"-->
+<!-- size="mini"-->
+<!-- :disabled="multiple"-->
+<!-- @click="deleteByIds"-->
+<!-- v-hasPermi="['code:engineering: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="['code:engineering:export']"-->
+<!-- >瀵煎嚭</el-button>-->
+<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
+ ref="elTable"
v-loading="loading"
+ style="margin-top: 20px"
:data="engineeringList"
+ height="100%"
sortable="custom"
row-key="id"
border
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- :show-overflow-tooltip="true"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ョ▼鍚嶇О" align="center" prop="projectName" />
- <el-table-column label="涓婚」鐩悕绉�" align="center" prop="projectInfoName" />
+ :show-overflow-tooltip="true">
+ <el-table-column label="椤圭洰鍚嶇О" prop="projectName" />
<el-table-column label="椤圭洰鎺ㄨ繘绫诲瀷" align="center" prop="projectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
@@ -132,16 +132,23 @@
<el-button
size="mini"
type="text"
+ icon="el-icon-plus"
+ style="margin-right: 10px"
+ @click="handleadd(scope.row)"
+ >娣诲姞瀛愬伐绋�</el-button>
+ <el-button
+ size="mini"
+ type="text"
icon="el-icon-edit"
+ v-if="!isProject(scope.row.id)"
@click="handleUpdate(scope.row)"
- v-hasPermi="['code:engineering:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
+ v-if="!isProject(scope.row.id)"
@click="deleteById(scope.row)"
- v-hasPermi="['code:engineering:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -213,11 +220,9 @@
<el-date-picker v-model="form.year "
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"/>
- </el-form-item>
- <el-form-item label="鐖跺伐绋�" prop="parent">
- <treeselect v-model="form.parent" @input="getProjectOwnerUnit" noChildrenText="鏃犲尮閰嶆暟鎹�" :options="selectOptions" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
+ type="year"
+ value-format="yyyy"
+ :picker-options="pickerOptions"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -275,6 +280,7 @@
projectType: null,
status: null,
},
+ addId:null,
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
@@ -302,6 +308,15 @@
this.getDeptList();
},
methods: {
+ pickerOptions: {
+ // 杩欓噷鍙互娣诲姞鏇村鐨刾icker閫夐」锛屼絾涓虹畝鍖栫ず渚嬶紝鍙睍绀虹鐢ㄥ叾浠栨棩鏈熺殑閫昏緫
+ // 鍏抽敭璁剧疆锛氭樉绀哄勾浠介�夋嫨鍣�
+ pickers: ['year']
+ },
+ isProject(id) {
+ const numericPattern = /^\d+(\.\d+)?$/;
+ return numericPattern.test(id)
+ },
getProjectOwnerUnit(unitId) {
console.log(unitId)
// if (deptId) {
@@ -386,8 +401,10 @@
year:null,
parent:null,
};
+ this.addId = null;
this.resetForm("form");
},
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -403,6 +420,12 @@
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
+ },
+ handleadd(row){
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞宸ョ▼";
+ this.addId = row.id;
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -423,15 +446,24 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
- console.log(this.form)
if (valid) {
+ if (this.addId != null){
+ this.form.parent = this.addId;
+ addProjectEngineering(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ return;
+ }
+ //淇敼
if (this.form.id != null) {
editProjectEngineering(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
- } else {
+ } else {//涓嶅瓨鍦╝ddId鐖跺伐绋嬫柊澧�
addProjectEngineering(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
--
Gitblit v1.8.0