From 9970225ed26a821bf382145a47b8d9871cdef0cd Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期日, 15 一月 2023 09:34:30 +0800
Subject: [PATCH] test
---
pages/modal/ms_classAttr.vue | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 44b738f..0928068 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -753,14 +753,14 @@
getApp().onScan((result)=>{
//console.log(result.decodedata);
var isVal =this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
-
+ //涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
if (isVal!=result.decodedata) {
this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
-
+ //瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
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++) {
@@ -785,6 +785,7 @@
clsid: this.$data.param.Sub_Cls.ID,
objid: "",
attr: req,
+ mast_attr: [],
inputParamter:[{ attr: 'mast_input_3037', value: result.decodedata }]
}
@@ -802,14 +803,32 @@
if(this.$data.subPanelList[i].scanCodeVal == result.decodedata)
isflag=false;
}
-
+ //瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
if (isflag) {
this.$data.scanCodeVal=result.decodedata;
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, 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 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];
@@ -833,6 +852,7 @@
clsid: this.$data.param.Sub_Cls.ID,
objid: "",
attr: req,
+ mast_attr: mast_req,
inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
}
@@ -2147,6 +2167,7 @@
button_name: '鏂板',
master: {
cls_id: this.$data.param.Sub_Cls.ID, // button=bottom鏃�master鐨刢ls_id
+ attr: info.mast_attr //涓绘暟鎹被灞炴�
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
}
};
@@ -2180,8 +2201,8 @@
if (actionlist) {
console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
+ for (var ii = 0; ii < actionlist.length; ii++) {
+ var action = actionlist[ii];
if (action.action_type == 'set_dlg_attr') {
var result = action.value;
for (var i = 0; i < result.length; i++) {
@@ -2231,18 +2252,21 @@
}
}
}
- } else if (data.action[i].action_type == 'set_global_attr') {
- $this.$data.global_attr = data.action[i].value || [];
- } else if (data.action[i].action_type == 'add_subcls_panel') {
+ } else if (action.action_type == 'set_global_attr') {
+ $this.$actiontr = action.value || [];
+ } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� var result = action.value;
let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
+ var scanCodeVal = $this.$data.scanCodeVal;
+ if(info.inputParamter[0].attr=="mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-"+ii;
$this.$data.subPanelList.push({
- scanCodeVal:$this.$data.scanCodeVal,
+ scanCodeVal:scanCodeVal,
subClassAttr:list_1
});
for (var i = 0; i < result.length; i++) {
for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- if($this.$data.subPanelList[s].scanCodeVal == $this.$data.scanCodeVal){
+ if($this.$data.subPanelList[s].scanCodeVal == scanCodeVal){
var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
for (var c = 0; c < _subClassAttr.length; c++) {
var attr = _subClassAttr[c].Attr;
@@ -2278,14 +2302,17 @@
if (data.result) {
let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
+ var scanCodeVal = $this.$data.scanCodeVal;
+ if(info.inputParamter[0].attr=="mast_input_3037")
+ scanCodeVal = "mast_input_3037-"+ii;
$this.$data.subPanelList.push({
- scanCodeVal:$this.$data.scanCodeVal,
+ scanCodeVal:scanCodeVal,
subClassAttr:list_1
});
var result = data.result;
for (var i = 0; i < result.length; i++) {
for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- if($this.$data.subPanelList[s].scanCodeVal == $this.$data.scanCodeVal){
+ if($this.$data.subPanelList[s].scanCodeVal == scanCodeVal){
var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
for (var c = 0; c < _subClassAttr.length; c++) {
var attr = _subClassAttr[c].Attr;
--
Gitblit v1.9.1