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/3200.vue | 108 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 41 deletions(-)
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index e634791..1390f1d 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -300,10 +300,11 @@
if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML椤甸潰") {
// HTML椤甸潰
//鑾峰彇鏁版嵁绫荤殑HTML椤甸潰
- await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id,options.paramValue);
+ await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id, options
+ .paramValue);
} else {
await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
-
+
await this.initial(options.paramValue);
}
// this.isFilter=true;
@@ -533,7 +534,7 @@
// console.log(styledef);
$this.ListPageHtml_Show = ret.result.style_def ? JSON.parse(styledef) : {};
// console.log($this.ListPageHtml_Show);
-
+
$this.initial(paramValue);
} else {
uni.showModal({
@@ -561,45 +562,34 @@
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) {
- if (type == 'mast') {
- 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 success = await this.getDictInfo(dataInfo)
+ if (type == 'mast') {
+ 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,
});
- //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
- if (itemName) {
- $this.head_styledef.form.items[index].value = itemName;
- var attr = $this.head_styledef.form.items[index].fieldId;
- $this.head_styledef.form.model[attr] = itemName;
- }
- $this.head_styledef.form.items[index].dict = list;
- var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
- $this.head_styledef = [];
- $this.head_styledef = head_styledef;
- } else {
- // $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
- // this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
- }
-
- } else {
- uni.showModal({
- title: this.translateSys("error") + "3.1",
- content: success.err_msg,
- showCancel: false,
- confirmText: this.translateSys("cancel")
});
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ if (itemName) {
+ $this.head_styledef.form.items[index].value = itemName;
+ var attr = $this.head_styledef.form.items[index].fieldId;
+ $this.head_styledef.form.model[attr] = itemName;
+ }
+ $this.head_styledef.form.items[index].dict = list;
+ var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+ $this.head_styledef = [];
+ $this.head_styledef = head_styledef;
+ } else {
+ // $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
+ // this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
}
- }).catch(ex => {
+ } catch (ex) {
// console.log(ex);
uni.showModal({
title: this.translateSys("error") + "3",
@@ -607,7 +597,36 @@
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);
+ }
+ })
+
+ })
+
},
// 鎵ц鏌ヨ浜嬩欢
@@ -993,6 +1012,13 @@
if (btn.FunCode == "Add" || btn.FunCode == "Modify") {
if (btn.Edit_dlg.Model == "small") {
this.showAddSmallDialog(btn, style, enviroment);
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys("unrealized"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
}
} else if (btn.FunCode == "Delete") {
this.DeleteObj(btn, style, enviroment);
@@ -1242,7 +1268,7 @@
if ((success.result || []).length > 0) {
const app = success.result[0]
var param = "";
- var appName = app.name || app.list_name
+ var appName = app.list_name || app.name
.Name;
var paramStr = app.param
if (paramStr) {
--
Gitblit v1.9.1