From d9d1b4332986fae66a00ef1f309d50560588920c Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期四, 09 二月 2023 17:06:28 +0800
Subject: [PATCH] test
---
pages/modal/ms_classAttr.vue | 124 +++++++++++++++-------------------------
1 files changed, 47 insertions(+), 77 deletions(-)
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 66f4673..e2af8ff 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){
@@ -824,21 +793,21 @@
if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
if(ar.Value=='璇�) ar.Value='';
if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
- req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+ req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
else if(ar.Type=='甯冨皵鍊�)
- req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+ req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
else
- req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
+ req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
}
}
var info = {
eventid: eventid,
- edtype: "0",
+ edtype: "7",//"0",
projectid: '',
rclsid: '',
robjid: '',
userlogin: '',
- clsid: this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
objid: "",
attr: req,
mast_attr: [],
@@ -874,11 +843,11 @@
if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
if(ar.Value=='璇�) ar.Value='';
if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
- mast_req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+ mast_req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
else if(ar.Type=='甯冨皵鍊�)
- mast_req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+ mast_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
else
- mast_req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
+ mast_req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
}
}
var req=[];
@@ -900,12 +869,12 @@
}
var info = {
eventid: eventid,
- edtype: "0",
+ edtype: '7',//"0",
projectid: '',
rclsid: '',
robjid: '',
userlogin: '',
- clsid: this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
objid: "",
attr: req,
mast_attr: mast_req,
@@ -2218,18 +2187,18 @@
var $this = this;
var enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�- cls_id: this.$data.param.Sub_Cls.ID, // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇�+ cls_id: 'MBOX',//this.$data.param.Sub_Cls.ID, // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇� 'button': 'top', // top/bottom
button_name: '鏂板',
master: {
- cls_id: this.$data.param.Sub_Cls.ID, // button=bottom鏃�master鐨刢ls_id
+ cls_id: 'MBOX',//this.$data.param.Sub_Cls.ID, // button=bottom鏃�master鐨刢ls_id
attr: info.mast_attr //涓绘暟鎹被灞炴�
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
}
};
enviroment.edit_dlg = {
type: 'small',//灏忕獥鍙�- class_id: this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
+ class_id: 'MBOX',//this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
}
if (data_attr) {
enviroment.edit_dlg.form_control = {//鎵�睘鐨勮〃鍗曟帶浠�@@ -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;
@@ -2497,20 +2467,20 @@
}
var dataJson={
master_cls:{
- cls_name:$this.$data.param.Master_Cls.Name,
+ cls_name:'MBOX',//$this.$data.param.Master_Cls.Name,
obj_attrs:req
},
input_3037:$this.$data.scanCodeVal, //鎵爜鍐呭
op_type:$this.$data.param.OperationType, //浣滀笟绫诲瀷瀹氫箟
sub_cls:{
- cls_name:$this.$data.param.Sub_Cls.Name,
+ cls_name:'MBOX',//$this.$data.param.Sub_Cls.Name,
objects:objects
}
};
console.log(JSON.stringify(dataJson));
var dataInfo = {
- edtype: "0", eventid: eventID, projectid: '',rclsid: '', robjid: '', userlogin: '',
- clsid: $this.$data.param.Sub_Cls.ID, objid: '',attr: JSON.stringify([]), extinfo: JSON.stringify([]),
+ 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));
--
Gitblit v1.9.1