From 40659a66c9858fcbc2aa92bbbfa5fb441c2d20c6 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期四, 16 二月 2023 11:22:00 +0800
Subject: [PATCH] test
---
pages/modal/ms_classAttr.vue | 124 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 26 deletions(-)
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 71ac490..f0babd9 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -410,7 +410,7 @@
<view class="form-group">
<!-- 宸﹀彸甯冨眬 -->
<p class="tx_title2" >{{param.Scan_Code.Name}}:</p>
- <input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
+ <input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
<a @tap="scan_classAttr_extButton()" ><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
</div>
@@ -781,6 +781,7 @@
//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
if (isVal!=result.decodedata) {
this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+ uni.hideKeyboard();
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
@@ -793,21 +794,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: [],
@@ -830,6 +831,7 @@
}
//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
if (isflag) {
+ uni.hideKeyboard();
this.$data.scanCodeVal=result.decodedata;
var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
@@ -843,11 +845,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=[];
@@ -869,12 +871,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,
@@ -885,6 +887,71 @@
}
}
})
+ },
+ scan_onevent(e){
+ // console.log(e.target);
+ var isflag=true;
+ for(var i in this.$data.subPanelList){
+ if(this.$data.subPanelList[i].scanCodeVal == e.target.value)
+ isflag=false;
+ }
+ //瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
+ if (isflag) {
+ uni.hideKeyboard();
+ this.$data.scanCodeVal=e.target.value;
+ var eventid = this.$data.param.Scan_Code.Input_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, value: ar.ValID ?ar.ValID :'' });
+ else if(ar.Type=='甯冨皵鍊�)
+ mast_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+ else
+ mast_req.push({ attr: ar.Name, value: 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: '7',//"0",
+ projectid: '',
+ rclsid: '',
+ robjid: '',
+ userlogin: '',
+ clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
+ objid: "",
+ attr: req,
+ mast_attr: mast_req,
+ inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
+ }
+
+ this.scan_DataObjRunCustomEvent(info, "");
+ }
+ }
},
onarrow(index,open){
// console.log(index+'--'+open);
@@ -1017,11 +1084,13 @@
// console.log(data_attr);
if (e.target.value != data_attr.Value) {
this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
- var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
+ // var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
+ //瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�+ var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
// self.event_no_sub = 1;
var req=[];
- var attrlist = this.$data.classAttrList;
+ var attrlist = this.$data.classAttrList; //涓绘暟鎹被灞炴�
for (var i = 0; i < attrlist.length; i++) {
var attr = attrlist[i].Attr;
for (var j = 0; j < attr.length; j++) {
@@ -1029,25 +1098,28 @@
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.Master_Cls.ID,
+ clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
objid: "",
attr: req,
+ mast_attr: [],
+ inputParamter:[{ attr: 'mast_input_3037', value: e.target.value }]
}
- this.DataObjRunCustomEvent(info, data_attr);
+
+ this.scan_DataObjRunCustomEvent(info, "");
}
}
@@ -2187,18 +2259,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 = {//鎵�睘鐨勮〃鍗曟帶浠�@@ -2467,20 +2539,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