From 41e6159cfa12416155adcd6747e48fab28ffc534 Mon Sep 17 00:00:00 2001
From: cyy <cuiqian2004@163.com>
Date: 星期一, 26 八月 2024 22:45:17 +0800
Subject: [PATCH] test
---
pages/modal/3018_2.vue | 39 ++++
pages/modal/5602.vue | 30 +++
pages/modal/5601.vue | 281 ++++++++++++++++++++++------------
pages/modal/3037_2.vue | 30 +++
pages/modal/3200.vue | 30 +++
manifest.json | 4
pages/modal/5600.vue | 30 +++
7 files changed, 340 insertions(+), 104 deletions(-)
diff --git a/manifest.json b/manifest.json
index a2e6a6b..1ed9c79 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.15",
- "versionCode" : 1115,
+ "versionName" : "1.1.16",
+ "versionCode" : 1116,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index ffa382f..855ad61 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -60,11 +60,11 @@
</view>
</uni-forms-item>
<!-- 鏍呮牸甯冨眬 -->
- <uni-row class="demo-uni-row" v-if="item.name=='Layout' && item.show==true">
+ <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
<uni-col v-for="(cols,key) in item.setting.colList"
:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
- <uni-forms-item class="head-form" v-if="cols!=null" :label="cols.label +'锛�"
- :label-width="cols.labelWidth+'px'">
+ <uni-forms-item class="head-form" v-if="cols!=null && cols.show==true" :label="cols.label +'锛�"
+ :label-width="cols.labelWidth+'px'" >
<!-- <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> -->
<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
<view class="input-wrapper"
@@ -382,7 +382,7 @@
$this.setData({
head_styledef: styledefHead
})
-
+ console.log("head_styledef",this.head_styledef)
if ($this.head_styledef.event?.length > 0) {
$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
if (a.event_id == "initial") {
@@ -482,6 +482,37 @@
})
},
+ getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+ const loginInfo = this.$store.getters.loginid
+ const dataSApi = this.$store.getters.getDataSApi
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+ .session_id,
+ data: info,
+ method: 'POST',
+ dataType: "json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({
+ "errMsg": ret.err_msg
+ });
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+
+ })
+
+ },
+
async loadInitEvent(eventid) {
var $this = this;
if (!eventid.includes('{')) eventid = '{' + eventid + '}';
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index de4968a..e6f824c 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -531,6 +531,36 @@
})
},
+getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+ const loginInfo = this.$store.getters.loginid
+ const dataSApi = this.$store.getters.getDataSApi
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+ .session_id,
+ data: info,
+ method: 'POST',
+ dataType: "json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({
+ "errMsg": ret.err_msg
+ });
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+
+ })
+
+ },
async loadInitEvent(eventid, type) {
var $this = this;
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 79d9908..d794f70 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -629,6 +629,36 @@
})
},
+getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+ const loginInfo = this.$store.getters.loginid
+ const dataSApi = this.$store.getters.getDataSApi
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+ .session_id,
+ data: info,
+ method: 'POST',
+ dataType: "json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({
+ "errMsg": ret.err_msg
+ });
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+
+ })
+
+ },
// 鎵ц鏌ヨ浜嬩欢
async onSearChange(clsid, eventid) {
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index d589191..df1fcee 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -543,6 +543,36 @@
})
},
+ getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+ const loginInfo = this.$store.getters.loginid
+ const dataSApi = this.$store.getters.getDataSApi
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+ .session_id,
+ data: info,
+ method: 'POST',
+ dataType: "json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({
+ "errMsg": ret.err_msg
+ });
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+
+ })
+
+ },
onClick(item) {
this.focusFieldId = item.fieldId
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 824013f..503c7dc 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -116,8 +116,9 @@
<view class="view-bottom" v-if="pageData.OK_Button==true">
<button type="default" @tap="cancel"
class="btn_cancel">{{translateSys('cancel')}}</button>
- <button type="primary" @tap="ok(pageData)"
- class="btn_add" :class="pageData.okLoading?'btn_disabled':''" :disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button>
+ <button type="primary" @tap="ok(pageData)" class="btn_add"
+ :class="pageData.okLoading?'btn_disabled':''"
+ :disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button>
</view>
</view>
</swiper-item>
@@ -260,8 +261,9 @@
//鍔犺浇Tab椤电
const pageList = this.param.Sub_Page || []
for (let i in pageList) {
- page.DefList = [];
+
const page = pageList[i]
+ page.DefList = [];
page.StyleDef = await this.Detail_UIstyleGetInfo(
this.ClsID,
page.UI_Style.ID
@@ -376,69 +378,117 @@
},
async Detail_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�- var $this = this;
- var dataInfo = {
- class_id: class_id,
- ui_style_id: style_id,
- };
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
- // console.log(ret);
- if (ret.err_code == 0) {
- var styledef = "";
- if (ret.result.style_def) {
- //mobox2鐨剆tyle_def鏄痡son瀛楃涓�- styledef = ret.result.style_def.replace(/\\/g, "");
- //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�- if (!ret.result.style_def.includes('"')) styledef = Base64
- .decode(ret.result
- .style_def);
- }
+ try {
+ var $this = this;
+ var dataInfo = {
+ class_id: class_id,
+ ui_style_id: style_id,
+ };
+ const ret = await this.getUIStyleInfo(dataInfo)
+ var styledef = "";
+ if (ret.result.style_def) {
+ //mobox2鐨剆tyle_def鏄痡son瀛楃涓�+ styledef = ret.result.style_def.replace(/\\/g, "");
+ //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+ if (!ret.result.style_def.includes('"')) styledef = Base64
+ .decode(ret.result
+ .style_def);
+ }
- const detailstyledef = ret.result.style_def ? JSON.parse(
- styledef) : {};
- detailstyledef.SelBut_Checked = true;
- for (let index in styledefHead.form.items) {
- const ele = styledefHead.form.items[index]
+ const detailstyledef = ret.result.style_def ? JSON.parse(
+ styledef) : {};
+ detailstyledef.SelBut_Checked = true;
+ for (let index in detailstyledef.form.items) {
+ const ele = detailstyledef.form.items[index]
- if (ele.name != "Layout") {
- if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- await this.DictGetInfo(ele.bind.dict,
+ if (ele.name != "Layout") {
+ if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict,
+ detailstyledef.form
+ .model, ele);
+ }
+ } else {
+ for (let j in ele.setting.colList) {
+ const col = ele.setting.colList[j]
+ if (col?.useDict == true) {
+ await this.DictGetInfo(col
+ .bind.dict,
detailstyledef.form
- .model, ele);
- }
- } else {
- for (let j in ele.setting.colList) {
- const col = ele.setting.colList[j]
- if (col?.useDict == true) {
- await this.DictGetInfo(col
- .bind.dict,
- detailstyledef.form
- .model, col);
- }
+ .model, col);
}
}
}
- console.log("Detail_UIstyleGetInfo", detailstyledef);
- return detailstyledef
- } else {
- return {}
- uni.showModal({
- title: this.translateSys("error") + "2",
- content: ret.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
}
- }).catch(ex => {
+ console.log("Detail_UIstyleGetInfo", detailstyledef);
+ return detailstyledef
+ } catch (ex) {
// console.log(ex);
uni.showModal({
- title: this.translateSys("error") + "2.1",
+ title: this.translateSys("error") + "2",
content: ex.errMsg,
showCancel: false,
confirmText: this.translateSys("cancel")
});
return {}
- });
+ }
+ // this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
+ // // console.log(ret);
+ // if (ret.err_code == 0) {
+ // var styledef = "";
+ // if (ret.result.style_def) {
+ // //mobox2鐨剆tyle_def鏄痡son瀛楃涓�+ // styledef = ret.result.style_def.replace(/\\/g, "");
+ // //mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+ // if (!ret.result.style_def.includes('"')) styledef = Base64
+ // .decode(ret.result
+ // .style_def);
+ // }
+
+ // const detailstyledef = ret.result.style_def ? JSON.parse(
+ // styledef) : {};
+ // detailstyledef.SelBut_Checked = true;
+ // for (let index in detailstyledef.form.items) {
+ // const ele = detailstyledef.form.items[index]
+
+ // if (ele.name != "Layout") {
+ // if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ // await this.DictGetInfo(ele.bind.dict,
+ // detailstyledef.form
+ // .model, ele);
+ // }
+ // } else {
+ // for (let j in ele.setting.colList) {
+ // const col = ele.setting.colList[j]
+ // if (col?.useDict == true) {
+ // await this.DictGetInfo(col
+ // .bind.dict,
+ // detailstyledef.form
+ // .model, col);
+ // }
+ // }
+ // }
+ // }
+ // console.log("Detail_UIstyleGetInfo", detailstyledef);
+ // return detailstyledef
+ // } else {
+ // return {}
+ // uni.showModal({
+ // title: this.translateSys("error") + "2",
+ // content: ret.err_msg,
+ // showCancel: false,
+ // confirmText: this.translateSys("cancel")
+ // });
+ // }
+ // }).catch(ex => {
+ // // console.log(ex);
+ // uni.showModal({
+ // title: this.translateSys("error") + "2.1",
+ // content: ex.errMsg,
+ // showCancel: false,
+ // confirmText: this.translateSys("cancel")
+ // });
+ // return {}
+ // });
},
@@ -481,12 +531,42 @@
}
},
- getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+ getDictInfo(info) { //Mobox3寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛� const loginInfo = this.$store.getters.loginid
const mobxoSApi = this.$store.getters.getMobxoSApi
return new Promise((resolve, reject) => {
uni.request({
url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
+ data: info,
+ method: 'POST',
+ dataType: "json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({
+ "errMsg": ret.err_msg
+ });
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+
+ })
+
+ },
+ getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+ const loginInfo = this.$store.getters.loginid
+ const dataSApi = this.$store.getters.getDataSApi
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+ .session_id,
data: info,
method: 'POST',
dataType: "json",
@@ -522,7 +602,7 @@
console.log(result.decodedata);
item.value = result.decodedata;
var $this = this;
- if (item.oldvalue != item.value&& item.value.trim() != "") {
+ if (item.oldvalue != item.value && item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -610,7 +690,7 @@
onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
console.log(item);
- if (item.oldvalue != item.value&& item.value.trim() != "") {
+ if (item.oldvalue != item.value && item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -628,47 +708,48 @@
},
getDetailAttrList(pageData) {
const detailAttrList = [];
- pageData.DefList.forEach(style => {
- var detail_attr = {};
- style.form.items.forEach(item => {
- if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => {
- if (cols != null) detail_attr[cols
- .fieldId] = cols.value;
- });
- } else
- detail_attr[item.fieldId] = item.value;
- });
-
- detail_attr['id'] = style.form.objId;
- if (pageData.Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
- if (style.SelBut_Checked == true)
- detailAttrList.push(detail_attr);
- } else
- detailAttrList.push(detail_attr);
- });
- // console.log(detailAttrList);
- //鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
- pageData.DefList.forEach(style => {
- style.form.attrs.forEach(attr => {
- for (var key in detailAttrList) {
- if (style.form.objId == detailAttrList[key][
- 'id'
- ]) {
- var keys = Object.keys(detailAttrList[key]);
- var isflag = true;
- keys.forEach((ele) => {
- if (ele == attr.attr) isflag =
- false;
+ if (pageData.DefList) {
+ pageData.DefList.forEach(style => {
+ var detail_attr = {};
+ style.form.items.forEach(item => {
+ if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList.forEach(cols => {
+ if (cols != null) detail_attr[cols
+ .fieldId] = cols.value;
});
- if (isflag) {
- detailAttrList[attr.attr] = attr.value;
+ } else
+ detail_attr[item.fieldId] = item.value;
+ });
+
+ detail_attr['id'] = style.form.objId;
+ if (pageData.Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+ if (style.SelBut_Checked == true)
+ detailAttrList.push(detail_attr);
+ } else
+ detailAttrList.push(detail_attr);
+ });
+ // console.log(detailAttrList);
+ //鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+ pageData.DefList.forEach(style => {
+ style.form.attrs.forEach(attr => {
+ for (var key in detailAttrList) {
+ if (style.form.objId == detailAttrList[key][
+ 'id'
+ ]) {
+ var keys = Object.keys(detailAttrList[key]);
+ var isflag = true;
+ keys.forEach((ele) => {
+ if (ele == attr.attr) isflag =
+ false;
+ });
+ if (isflag) {
+ detailAttrList[attr.attr] = attr.value;
+ }
}
}
- }
+ });
});
- });
-
+ }
const jsonlist = [];
detailAttrList.forEach(attr => {
jsonlist.push({
@@ -711,6 +792,7 @@
var $this = this;
const jsonList = []
this.pageDetail.forEach((page) => {
+
jsonList.push({
page_name: page.Name,
item_list: $this.getDetailAttrList(page
@@ -718,6 +800,7 @@
.Select_Button),
ext_data: page.ExtData || {}
})
+
})
const data_json = Base64.encode(
JSON.stringify(jsonList)
@@ -742,7 +825,7 @@
input_param: input_param,
};
this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
- // console.log(ret);
+ console.log(ret);
if (ret.err_code == 0) {
var result = ret.result;
if (result.ret != 0) {
@@ -789,6 +872,7 @@
if (result.result_type == 0 && result.action) {
result.action.forEach(item => {
+
if (item.action_type ==
"insert_subtable_page_row"
) { //鐮佺洏涓�@@ -1310,7 +1394,7 @@
return;
}
const pageData = this.pageDetail.find((page) => {
- return value.page_name == page.Name;
+ return data.page_name == page.Name;
});
if (!pageData)
return
@@ -1353,11 +1437,11 @@
viewAceionContent(data) {
var $this = this;
const pageData = $this.pageDetail.find((page) => {
- return value.page_name == page.Name;
+ return data.page_name == page.Name;
});
if (!pageData)
return
-
+ console.log("viewAceionContent", pageData)
pageData.ExtData = data.ext_data || {}
if (JSON.stringify(data.content) == '{}') {
@@ -1365,7 +1449,7 @@
}
data.content.forEach(cont => {
var styleStr = JSON.stringify(pageData.StyleDef);
-
+ console.log("viewAceionContent2", pageData)
var detailStyle = JSON.parse(styleStr);
detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
@@ -2211,11 +2295,12 @@
color: #fff;
display: inline-block;
}
+
.btn_disabled {
background-color: #ddd;
color: #888;
}
-
+
}
}
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 66f1fbe..622cfaa 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -549,6 +549,36 @@
})
},
+getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+ const loginInfo = this.$store.getters.loginid
+ const dataSApi = this.$store.getters.getDataSApi
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+ .session_id,
+ data: info,
+ method: 'POST',
+ dataType: "json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({
+ "errMsg": ret.err_msg
+ });
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+
+ })
+
+ },
onClick(item) {
this.focusFieldId = item.fieldId
--
Gitblit v1.9.1