From 792a7de9550294e9ab2df42402402ef966153ff2 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 12 八月 2024 13:45:40 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA
---
pages/modal/5601.vue | 109 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 40 deletions(-)
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index d44ca5b..f9e3e05 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -24,7 +24,7 @@
<!-- 鏍呮牸甯冨眬 -->
<uni-row v-else :gutter="item.setting.gutter">
<uni-col
- :span=" item.setting.spanList && item.setting.spanList[key - 1]? item.setting.spanList[key - 1] : 24 / item.setting.col"
+ :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
v-for="(col,key) in item.setting.colList">
<uni-forms-item :label="col.label +'锛�" :label-width="col.labelWidth+'px'">
<uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''"
@@ -84,7 +84,7 @@
<!-- 鏍呮牸甯冨眬 -->
<uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
<uni-col
- :span=" item.setting.spanList && item.setting.spanList[key - 1]? item.setting.spanList[key - 1] : 24 / item.setting.col"
+ :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
v-for="(cols,key) in item.setting.colList">
<view v-if="cols!=null">
<text class="txt_title"
@@ -271,7 +271,7 @@
this.setData({
pageDetail: pageList
})
-
+
console.log(this.pageDetail);
},
changeSwiper(evt) {
@@ -299,7 +299,7 @@
class_id: class_id,
ui_style_id: style_id,
};
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
+ this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
// console.log(ret);
if (ret.err_code == 0) {
var styledef = "";
@@ -313,7 +313,8 @@
}
const styledefHead = styledef ? JSON.parse(styledef) : {};
- styledefHead.form.items.forEach(async (ele) => {
+ for (let i in styledefHead.form.items) {
+ const ele = styledefHead.form.items[i]
if (ele.name != "Layout") {
if (ele?.useDict) {
//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
@@ -330,7 +331,8 @@
}
}
} else {
- ele.setting.colList.forEach(async (col) => {
+ for (let j in ele.setting.colList) {
+ const col = ele.setting.colList[j]
if (col?.useDict) {
//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
await this.DictGetInfo(col.bind
@@ -348,9 +350,9 @@
})
}
}
- });
+ }
}
- });
+ }
this.setData({
head_styledef: styledefHead
})
@@ -379,7 +381,7 @@
class_id: class_id,
ui_style_id: style_id,
};
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
+ this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
// console.log(ret);
if (ret.err_code == 0) {
var styledef = "";
@@ -395,7 +397,8 @@
const detailstyledef = ret.result.style_def ? JSON.parse(
styledef) : {};
detailstyledef.SelBut_Checked = true;
- detailstyledef.form.items.forEach(async (ele, index) => {
+ for (let index in styledefHead.form.items) {
+ const ele = styledefHead.form.items[index]
if (ele.name != "Layout") {
if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
@@ -404,16 +407,17 @@
.model, ele);
}
} else {
- ele.setting.colList.forEach(async (col) => {
+ 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 {
@@ -445,34 +449,28 @@
dict_id: dict.id,
dict_name: dict.name
};
- // console.log(dataInfo);
- this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
- console.log(success);
- if (success.err_code == 0) {
- var list = [];
- var itemName = '';
- success.result.dict_item_list.forEach((item) => {
- if (item.is_default == '1')
- itemName = item.name;
- list.push({
- text: item.value,
- value: item.name,
- });
+ try {
+ const res = await this.getDictInfo(dataInfo)
+ var list = [];
+ var itemName = '';
+ res.result.dict_item_list.forEach((item) => {
+ if (item.is_default == '1')
+ itemName = item.name;
+ list.push({
+ text: item.value,
+ value: item.name,
});
- if (itemName) {
- formItem.value = itemName;
- formModel[formItem.fieldId] = itemName;
- }
- formItem.dict = list;
- } else {
- uni.showModal({
- title: this.translateSys("error") + "3.1",
- content: success.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ });
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ if (itemName) {
+ formItem.value = itemName;
+ formModel[formItem.fieldId] = itemName;
}
- }).catch(ex => {
+ formItem.dict = list;
+
+ // $this.head_styledef.form.items[index].dictitem=success.result;
+ // this.$store.commit("classAttrList", $this.$data.classAttrList);
+ } catch (ex) {
// console.log(ex);
uni.showModal({
title: this.translateSys("error") + "3",
@@ -480,8 +478,39 @@
showCancel: false,
confirmText: this.translateSys("cancel")
});
- });
+ }
+
},
+ 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);
+ }
+ })
+
+ })
+
+ },
+
onClick(item) {
this.focusFieldId = item.fieldId
},
--
Gitblit v1.9.1