From 91dfa886ed8d62d080d4070a7756231d0c296dac Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期三, 01 二月 2023 08:32:09 +0800
Subject: [PATCH] test

---
 pages/modal/ms_classAttr.vue |   90 +++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 66f4673..71ac490 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -221,7 +221,7 @@
 	.v-panellist{
 		border:4rpx solid #aaa;
 		border-radius: 10rpx;
-		margin: 0rpx 20rpx 10rpx 20rpx;
+		margin: 10rpx 20rpx 0rpx 20rpx;
 	}
 	.v-paneldel{
 		text-align: right;
@@ -689,65 +689,34 @@
 				});
 			},
 			panel_del(index){
+				var $this = this;
 				if (this.$data.subPanelList[index].scanCodeVal == this.$data.scanCodeVal) {
 					this.$data.scanCodeVal='';
 				}
-				if (this.$data.param.Sub_Cls.Slave_Change_Event) { //鍒ゆ柇浠庢暟鎹槸鍚︽湁浠庡鐞嗕簨浠�-					var eventid = this.$data.param.Sub_Cls.Slave_Change_Event.ID; 
-					if (eventid) {
-						var mast_req=[];
-						//涓绘暟鎹被灞炴�
-						var classattrlist = this.$data.classAttrList;  
-						for (var i = 0; i < classattrlist.length; i++) {
-							var attr = classattrlist[i].Attr;
-							for (var j = 0; j < attr.length; j++) {
-								var ar = attr[j];
-								if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
-									if(ar.Value=='璇�) ar.Value='';
-								if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-									mast_req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
-								else if(ar.Type=='甯冨皵鍊�)
-									mast_req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
-								else
-									mast_req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
-							}
-						}
-						var req=[];
-						//瀛愭暟鎹被灞炴�
-						var attrlist = this.$data.subClassAttrList;
-						for (var i = 0; i < attrlist.length; i++) { 
-							var attr = attrlist[i].Attr;
-							for (var j = 0; j < attr.length; j++) {
-								var ar = attr[j];
-								if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
-									if(ar.Value=='璇�) ar.Value='';
-								if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-									req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
-								else if(ar.Type=='甯冨皵鍊�)
-									req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
-								else
-									req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
-							}
-						}
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.param.Sub_Cls.ID,
-							objid: "",
-							attr: req,
-							mast_attr: mast_req,
-							inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }],
-							delIndex:index
-						}
-						
-						this.scan_DataObjRunCustomEvent(info, "");
-					}
-				}else{
+				if(!this.$data.subPanelList[index].ObjID)
 					this.$data.subPanelList.splice(index, 1);
+				else{
+					var dataInfo = {
+						clsId:this.$data.param.Sub_Cls.ID,
+						objId:this.$data.subPanelList[index].ObjID
+					};
+					console.log(dataInfo);
+					// return;
+					uni.showLoading({ title:"鍔犺浇涓�.." });
+					this.$store.dispatch('DelObj',dataInfo).then(success=>{
+						console.log(success);
+						uni.hideLoading();
+						if (success.code=='00000') {
+							$this.$data.subPanelList.splice(index, 1);
+							uni.showModal({title:"鎻愮ず",content:"鍒犻櫎鎴愬姛锛�,showCancel:false,confirmText:"鍙栨秷"});
+						}else{
+							uni.showModal({title:"閿欒9",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
+						}
+					}).catch(ex=>{
+						console.log(ex);
+						uni.hideLoading();
+						uni.showModal({title:"鎻愮ず9.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+					});
 				}
 			},
 			async classGridStyleInfo(clsid,styleName,clsType){
@@ -2323,6 +2292,8 @@
 		    			            for (var i = 0; i < result.length; i++) {
 										for (var s = 0; s < $this.$data.subPanelList.length; s++) {
 											if($this.$data.subPanelList[s].scanCodeVal == scanCodeVal){
+												if(result[i].attr=="S_ID")
+													$this.$data.subPanelList[s].ObjID=result[i].value;
 												var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
 												for (var c = 0; c < _subClassAttr.length; c++) {
 													var attr = _subClassAttr[c].Attr;
@@ -2352,10 +2323,7 @@
 										    }
 										}
 									}
-		    			        } else if (action.action_type == 'del_subcls_panel') {
-									
-									$this.$data.subPanelList.splice(info.delIndex, 1);
-								}	
+		    			        }
 		    			    }
 		    			}
 		    			
@@ -2372,6 +2340,8 @@
 		    			    for (var i = 0; i < result.length; i++) {
 		    			        for (var s = 0; s < $this.$data.subPanelList.length; s++) {
 									if($this.$data.subPanelList[s].scanCodeVal == scanCodeVal){
+										if(result[i].attr=="S_ID")
+											$this.$data.subPanelList[s].ObjID=result[i].value;
 										var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
 										for (var c = 0; c < _subClassAttr.length; c++) {
 											var attr = _subClassAttr[c].Attr;

--
Gitblit v1.9.1