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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/engineering/index.vue b/src/views/engineering/index.vue
index de2f87c..f0221c6 100644
--- a/src/views/engineering/index.vue
+++ b/src/views/engineering/index.vue
@@ -105,7 +105,7 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:show-overflow-tooltip="true">
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="projectName" />
+ <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"/>
@@ -133,18 +133,21 @@
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)"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
+ v-if="!isProject(scope.row.id)"
@click="deleteById(scope.row)"
>鍒犻櫎</el-button>
</template>
@@ -217,8 +220,9 @@
<el-date-picker v-model="form.year "
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"/>
+ type="year"
+ value-format="yyyy"
+ :picker-options="pickerOptions"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -304,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) {
--
Gitblit v1.8.0