From 0daed9b2a7474eebb45ec16da010ea87426bd080 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期一, 27 三月 2023 10:16:05 +0800
Subject: [PATCH] 3037批量批量新增主从数据--浏览状态下如果选择了脚本则执行脚本，没有就关闭当前页面返回上一页
---
pages/modal/ms_classAttr.vue | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index ddc80fe..6900b88 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -610,7 +610,7 @@
<button type="default" @tap="cancel" class="btn_cancel" v-if="param.Sub_Cls.Can_Add_Delete == true">鍙栨秷</button>
<button type="default" @tap="sava" class="btn_add" v-if="param.Sub_Cls.Can_Add_Delete == true">{{title}}</button>
- <button type="default" @tap="cancel" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false">{{title}}</button>
+ <button type="default" @tap="sava" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false">{{title}}</button>
</view>
</template>
@@ -1316,8 +1316,10 @@
sava(){
if (this.$data.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈� this.scan_OKDataObjRunCustomEvent(this.$data.param.Before_OK_Event.ID);
- else
+ else if (this.$data.param.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈� this.scan_OKDataObjRunCustomEvent(this.$data.param.After_OK_Event.ID);
+ else
+ uni.navigateBack({delta:1 });//杩斿洖灞傛暟锛�鍒欎笂涓婇〉
},
add(){
uni.showLoading({
@@ -2577,13 +2579,13 @@
objects:objects
}
};
- console.log(JSON.stringify(dataJson));
+ // console.log(JSON.stringify(dataJson));
var dataInfo = {
edtype: "7", eventid: eventID, projectid: '',rclsid: '', robjid: '', userlogin: '',
clsid: 'MBOX', objid: '',attr: JSON.stringify([]), extinfo: JSON.stringify([]),
global_attr: JSON.stringify($this.$data.global_attr),dataJson:JSON.stringify(dataJson)
}
- console.log(JSON.stringify(dataInfo));
+ // console.log(JSON.stringify(dataInfo));
console.log(dataInfo);
this.$store.dispatch('DataObjRunCustomEventInfo',dataInfo).then(success=>{
console.log(success);
@@ -2591,24 +2593,6 @@
if (success.code=='00000') {
var data = JSON.parse(success.data);
var result = data.result;
- for (var i = 0; i < result.length; i++) {
- // self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
- var length = 0;
- if (!$this.$data.refdatastore.filter(function (s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $this.$data.refdatastore.push(result[i]);
- }
- if (length == 0) {
- for (var j = 0; j < $this.$data.refdatastore.length; j++) {
- if ($this.$data.refdatastore[j].attr == result[i].attr) {
- $this.$data.refdatastore[j].value = result[i].value;
- }
- }
- }
- }
-
if(eventID != $this.$data.param.After_OK_Event.ID)
$this.scan_OKDataObjRunCustomEvent($this.$data.param.After_OK_Event.ID);
else{
--
Gitblit v1.9.1