From ec63534e04c68e067dcb0380e56f2e5312de24a3 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 17:18:41 +0800
Subject: [PATCH] 字典取值判断附加值还是名称
---
pages/modal/3018_2.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 2423495..294b0f0 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -144,9 +144,9 @@
</a>
</view>
</view>
- <button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0"
- :class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
- <button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
+ <button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0 && btnName != ''"
+ :class="saving?'btn_disabled':''" :disabled="saving">{{btnName}}</button>
+ <button type="default" @tap="cancel" :class="(dropdownBtns.length> 0 || btnName != '')?'btn_cancel':'btn_cancel2'">{{translateSys('cancel')}}</button>
</view>
<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -197,6 +197,7 @@
data() {
return {
title: this.translateSys('add2'),
+ btnName: "",
param: {},
edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
edit_ok_event: "", //寮圭獥鐐瑰嚮OK 瑙﹀彂浜嬩欢ID
@@ -299,6 +300,7 @@
this.$data.param = JSON.parse(options.param);
this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
.titlename; //璁剧疆鎸夐挳鏂囧瓧
+ this.$data.btnName = this.$data.param.Add_BtnName || ""
this.loadData(options.paramValue)
},
computed: {
@@ -468,12 +470,12 @@
var itemName = '';
(res.dict_item_list || []).forEach((item) => {
if (item.is_default == '1')
- itemName = item.name;
+ itemName =item.value ? item.value : item.name
list.push({
- text: item.name,
+ text: item.value ? item.value : item.name,
value: item.id,
});
- });
+ });
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
if (itemName) {
formItem.value = itemName;
@@ -1045,7 +1047,7 @@
info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var obj_attr = {};
info.attr.forEach(item => {
- obj_attr[item.attr] = item.val;
+ obj_attr[item.attr] = item.value;
});
if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
var dataInfo = {
@@ -2199,6 +2201,16 @@
float: right;
display: inline-block;
}
+ .btn_cancel2 {
+ width: 90%;
+ margin: 0 10rpx;
+ background: #fff;
+ border: none;
+ color: #000;
+ font-size: 38rpx;
+ float: right;
+ display: inline-block;
+ }
.uni-padding-wrap {
margin: 2rpx 0 0 10rpx;
--
Gitblit v1.9.1