From e2255cad8935c961fe161eca60dc88b0930395ad Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 11 十二月 2023 15:25:00 +0800
Subject: [PATCH] 项目表
---
web/packages/components/zt-dialog/src/zt-dialog.vue | 20 +++++++++++++-------
web/packages/components/zt-table-column-handle/src/zt-table-column-handle.vue | 6 +-----
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | 2 +-
web/src/views/modules/testCheckOrder/TestCheckOrder.vue | 2 +-
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/web/packages/components/zt-dialog/src/zt-dialog.vue b/web/packages/components/zt-dialog/src/zt-dialog.vue
index bb441b7..8ef6a6e 100644
--- a/web/packages/components/zt-dialog/src/zt-dialog.vue
+++ b/web/packages/components/zt-dialog/src/zt-dialog.vue
@@ -12,23 +12,28 @@
@close="onClose">
<slot></slot>
<template slot="footer">
+ <template v-if="isView">
+ <el-button type="info" @click="close()">{{ $t('close') }}</el-button>
+ </template>
+ <template v-else>
<template v-if="stepMarker && stepMarker.indexOf('first')>0">
- <el-button type="warning" @click="formSubmit('zc')">鏆傚瓨</el-button>
- <el-button type="warning" @click="formSubmit('tj')" v-if="">鎻愪氦
- </el-button>
+ <el-button type="warning" @click="formSubmit('zc')">鏆傚瓨</el-button>
+ <el-button type="warning" @click="formSubmit('tj')" v-if="">鎻愪氦
+ </el-button>
</template>
<template v-else-if="stepMarker">
- <el-button type="warning" @click="formSubmit('zc')">鏆傚瓨</el-button>
- <el-button type="warning" @click="formSubmit('bl')">鍔炵悊</el-button>
+ <el-button type="warning" @click="formSubmit('zc')">鏆傚瓨</el-button>
+ <el-button type="warning" @click="formSubmit('bl')">鍔炵悊</el-button>
</template>
<el-button type="primary" @click="formSubmit('qd')" v-preventReClick v-else-if="editAble && hasConfirm">{{
$t('confirm') }}
</el-button>
<el-button type="warning" @click="formSubmit('bc')" v-else-if="editAble">淇濆瓨
</el-button>
+
<el-button @click="visible = false" v-if="editAble||stepMarker">{{ $t('cancel') }}</el-button>
<el-button type="info" @click="close()" v-else>{{ $t('close') }}</el-button>
-
+ </template>
<slot name="footer"></slot>
</template>
</el-dialog>
@@ -69,7 +74,8 @@
data() {
return {
dataFormBack: null,
- visible: false
+ visible: false,
+ isView:true,
//editAble: true // 鏄惁鍙紪杈�
}
},
diff --git a/web/packages/components/zt-table-column-handle/src/zt-table-column-handle.vue b/web/packages/components/zt-table-column-handle/src/zt-table-column-handle.vue
index 37ef19a..6f9cfc3 100644
--- a/web/packages/components/zt-table-column-handle/src/zt-table-column-handle.vue
+++ b/web/packages/components/zt-table-column-handle/src/zt-table-column-handle.vue
@@ -41,11 +41,7 @@
return typeof this.hasView === 'boolean' ? this.hasView : this.hasView(row)
},
isCanEidt(row) {
- if(row.stepMarker && row.stepMarker.includes('wc')){
- return false
- }else {
- return typeof this.hasEdit === 'boolean' ? this.hasEdit : this.hasEdit(row)
- }
+ return typeof this.hasEdit === 'boolean' ? this.hasEdit : this.hasEdit(row)
},
isCanDelete(row) {
return typeof this.hasDelete === 'boolean' ? this.hasDelete : this.hasDelete(row)
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index b91c86c..e7f22df 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -383,7 +383,7 @@
if (!this.dataForm.disabled) {
if (!row.stepMarker) {
this.stepMarker = 'pzxbg_first'
- this.title = '鍏ュ簱鐢宠'
+ this.title = '鍙樻洿鐢宠'
} else {
this.title = row.stepName
this.stepMarker = row.stepMarker
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
index 5ab6c0d..43fd251 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
@@ -25,7 +25,7 @@
<zt-table-column-handle :table="table" :hasEdit='false' edit-perm="testCheckOrder:update"
delete-perm="testCheckOrder::delete">
<template v-slot="{row}">
- <zt-table-button type="primary" v-if="(row.stepMarker && row.stepMarker.includes('wc'))" @click="openEditWin(row)">淇敼</zt-table-button>
+ <zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
</template>
</zt-table-column-handle>
--
Gitblit v1.9.1