From a39097f01f0307a911180a43faa4569b38ea1edd Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 10 九月 2024 11:37:21 +0800
Subject: [PATCH] 单选框 和字典
---
pages/modal/3018_2.vue | 30 +
pages/modal/3200_view.vue | 18 +
pages/modal/5602.vue | 4
pages/modal/5601.vue | 4
pages/modal/3037_2.vue | 836 ++++++++++++++++++++++++++-------------------------
pages/modal/3200.vue | 23 +
manifest.json | 4
pages/modal/5600.vue | 4
8 files changed, 502 insertions(+), 421 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2b133d0..3b92a57 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.21",
- "versionCode" : 1121,
+ "versionName" : "1.1.22",
+ "versionCode" : 1122,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 7bbbe9c..fc26893 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -46,6 +46,15 @@
<text>{{item.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+ @change="onModelValue(item)">
+ <label v-for="(item2) in item.selections" :key="item2.value">
+ <radio :value="item2.value" :checked="item2.value === item.value" />
+ <text>{{item2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch class="input-switch" v-if="item.name=='Switch'"
:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
@@ -95,7 +104,7 @@
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
- :class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
@change="onModelValue(cols)" :data-ischeck="cols.value"
:style="{'margin-left':'10rpx'}">
<label>
@@ -103,15 +112,24 @@
<text>{{cols.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+ @change="onModelValue(cols)">
+ <label v-for="(cols2) in cols.selections" :key="cols2.value">
+ <radio :value="cols2.value" :checked="cols2.value === cols.value" />
+ <text>{{cols2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
- :disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)"
+ :disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
:style="{'margin-left':'10rpx'}" />
<!-- 鏃ユ湡鏃堕棿 -->
<view class="input-wrapper"
v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
- :disabled="item.disabled" :value="cols.value" @change="onModelValue(cols)">
+ :disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
<view class="picker">{{cols.value}}</view>
</picker>
</view>
@@ -295,7 +313,7 @@
},
methods: {
-
+
setData: function(obj) {
let that = this;
let keys = [];
@@ -456,8 +474,8 @@
if (item.is_default == '1')
itemName = item.name;
list.push({
- text: item.value,
- value: item.name,
+ text: item.name,
+ value: item.id,
});
});
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 0336126..cebc971 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -46,6 +46,14 @@
<text>{{item.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled" @change="onModelValue(item)">
+ <label v-for="(item2) in item.selections" :key="item2.value">
+ <radio :value="item2.value" :checked="item2.value === item.value" />
+ <text>{{item2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
v-model="item.value" @change="onModelValue(item)" :style="{'margin-left':'10rpx'}" />
@@ -126,6 +134,15 @@
<text>{{item.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(item)">
+ <label v-for="(item2) in item.selections" :key="item2.value">
+ <radio :value="item2.value" :checked="item2.value === item.value" />
+ <text>{{item2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
@@ -174,7 +191,7 @@
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
- :class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
@change="onModelValue(cols)" :data-ischeck="cols.value"
:style="{'margin-left':'10rpx'}">
<label>
@@ -182,15 +199,24 @@
<text>{{cols.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+ @change="onModelValue(cols)">
+ <label v-for="(cols2) in cols.selections" :key="cols2.value">
+ <radio :value="cols2.value" :checked="cols2.value === cols.value" />
+ <text>{{cols2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
- :disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)"
+ :disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
:style="{'margin-left':'10rpx'}" />
<!-- 鏃ユ湡鏃堕棿 -->
<view class="input-wrapper"
v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
- :disabled="item.disabled" :value="cols.value" @change="onModelValue(cols)">
+ :disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
<view class="picker">{{cols.value}}</view>
</picker>
</view>
@@ -465,8 +491,8 @@
if (item.is_default == '1')
itemName = item.name;
list.push({
- text: item.value,
- value: item.name,
+ text: item.name,
+ value: item.id,
});
});
@@ -1220,217 +1246,217 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
- .err_info.join('<br/>') : '';
- if (data.ret == 801) {
- if (this.param.Only_Script_Error) {
- let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos + 1);
- }
- uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- return false
- } else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
- '<br/>') : '';
- if (tip) uni.showModal({
+ if (data.ret != 0) {
+ var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+ .err_info.join('<br/>') : '';
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
+ } else uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+ return false
+ } else {
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
+ '<br/>') : '';
+ if (tip) uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- for (var i = 0; i < result.length; i++) {
- if (result[i].choice_list) {
- for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
- var attr = $this.head_styledef.form.items[c];
- if (attr.name != 'Layout') {
- if (attr.fieldId == result[i].attr) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "text": val,
- "value": val
- });
- }
- attr.dict = dictItemList;
- }
- } else if (attr.name == 'Layout') {
- attr.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == result[i].attr) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "text": val,
- "value": val
- });
- }
- col.dict = dictItemList;
- }
- }
- });
- }
- }
- }
- for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
- var attr = $this.$data.head_styledef.form.items[c];
- // console.log(attr[j].Name+'=='+result[i].attr);
+ var actionlist = data.action;
+ if (actionlist) {
+ console.log(actionlist);
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ for (var i = 0; i < result.length; i++) {
+ if (result[i].choice_list) {
+ for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
+ var attr = $this.head_styledef.form.items[c];
if (attr.name != 'Layout') {
if (attr.fieldId == result[i].attr) {
- attr.value = '';
- attr.oldvalue = '';
- attr.value = result[i].value;
- attr.oldvalue = result[i].value;
- $this.head_styledef.form.model[attr.fieldId] = result[i]
- .value;
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "text": val,
+ "value": val
+ });
+ }
+ attr.dict = dictItemList;
}
} else if (attr.name == 'Layout') {
attr.setting.colList.forEach(col => {
if (col) {
if (col.fieldId == result[i].attr) {
- col.value = '';
- col.oldvalue = '';
- col.value = result[i].value;
- col.oldvalue = result[i].value;
- $this.head_styledef.form.model[col
- .fieldId] = result[i].value;
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "text": val,
+ "value": val
+ });
+ }
+ col.dict = dictItemList;
}
}
});
- }
-
- }
- var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $this.$data.refdatastore.push(result[i]);
- }
- if (length == 0) {
- for (var j = 0; j < $this.$data.refdatastore.length; j++) {
- if ($this.$data.refdatastore[j].attr == result[i].attr) {
- $this.$data.refdatastore[j].value = result[i].value;
- }
}
}
}
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- result.forEach(async (attr, key) => {
- $this.$data.head_styledef.form.items.forEach(async (ele,
- index) => {
- //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) {
- ele.show = attr.show;
- }
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr
- .attr) {
- col.show = attr
- .show;
- }
- }
- });
+ for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
+ var attr = $this.$data.head_styledef.form.items[c];
+ // console.log(attr[j].Name+'=='+result[i].attr);
+ if (attr.name != 'Layout') {
+ if (attr.fieldId == result[i].attr) {
+ attr.value = '';
+ attr.oldvalue = '';
+ attr.value = result[i].value;
+ attr.oldvalue = result[i].value;
+ $this.head_styledef.form.model[attr.fieldId] = result[i]
+ .value;
}
- });
- });
- var head_styledef = JSON.parse(JSON.stringify($this.$data.head_styledef));
- $this.$data.head_styledef = [];
- $this.$data.head_styledef = head_styledef;
- // console.log($this.$data.head_styledef);
- } else if (action.action_type == 'set_global_attr') {
- $this.$data.global_attr = action.value || [];
- } else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("quotation_mark_left") + action
- .action_type + this.translateSys(
- "quotation_mark_right") + this.translate(
- "tip_action_unprocessed"),
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ } else if (attr.name == 'Layout') {
+ attr.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr) {
+ col.value = '';
+ col.oldvalue = '';
+ col.value = result[i].value;
+ col.oldvalue = result[i].value;
+ $this.head_styledef.form.model[col
+ .fieldId] = result[i].value;
+ }
+ }
+ });
+ }
+
+ }
+ var length = 0;
+ if (!$this.$data.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.$data.refdatastore.push(result[i]);
+ }
+ if (length == 0) {
+ for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+ if ($this.$data.refdatastore[j].attr == result[i].attr) {
+ $this.$data.refdatastore[j].value = result[i].value;
+ }
+ }
+ }
}
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ result.forEach(async (attr, key) => {
+ $this.$data.head_styledef.form.items.forEach(async (ele,
+ index) => {
+ //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr.attr) {
+ ele.show = attr.show;
+ }
+ } else if (ele.name == 'Layout') {
+ ele.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr
+ .attr) {
+ col.show = attr
+ .show;
+ }
+ }
+ });
+ }
+ });
+ });
+ var head_styledef = JSON.parse(JSON.stringify($this.$data.head_styledef));
+ $this.$data.head_styledef = [];
+ $this.$data.head_styledef = head_styledef;
+ // console.log($this.$data.head_styledef);
+ } else if (action.action_type == 'set_global_attr') {
+ $this.$data.global_attr = action.value || [];
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys("quotation_mark_left") + action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this.translate(
+ "tip_action_unprocessed"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
}
}
+ }
- if (data.result) {
- var result = data.result;
- for (var i = 0; i < result.length; i++) {
- for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
- var attr = $this.$data.head_styledef.form.items[c];
- if (attr.name != 'Layout') {
- if (attr.fieldId == result[i].attr) {
- attr.value = '';
- attr.oldvalue = '';
- attr.value = result[i].value;
- attr.oldvalue = result[i].value;
- $this.head_styledef.form.model[attr.fieldId] = result[i].value;
- }
- } else if (attr.name == 'Layout') {
- attr.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == result[i].attr) {
- col.value = '';
- col.oldvalue = '';
- col.value = result[i].value;
- col.oldvalue = result[i].value;
- $this.head_styledef.form.model[col.fieldId] =
- result[i].value;
- }
- }
- });
+ if (data.result) {
+ var result = data.result;
+ for (var i = 0; i < result.length; i++) {
+ for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
+ var attr = $this.$data.head_styledef.form.items[c];
+ if (attr.name != 'Layout') {
+ if (attr.fieldId == result[i].attr) {
+ attr.value = '';
+ attr.oldvalue = '';
+ attr.value = result[i].value;
+ attr.oldvalue = result[i].value;
+ $this.head_styledef.form.model[attr.fieldId] = result[i].value;
}
-
- }
-
- var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $this.$data.refdatastore.push(result[i]);
- }
- if (length == 0) {
- for (var j = 0; j < $this.$data.refdatastore.length; j++) {
- if ($this.$data.refdatastore[j].attr == result[i].attr) {
- $this.$data.refdatastore[j].value = result[i].value;
+ } else if (attr.name == 'Layout') {
+ attr.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr) {
+ col.value = '';
+ col.oldvalue = '';
+ col.value = result[i].value;
+ col.oldvalue = result[i].value;
+ $this.head_styledef.form.model[col.fieldId] =
+ result[i].value;
+ }
}
+ });
+ }
+
+ }
+
+ var length = 0;
+ if (!$this.$data.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.$data.refdatastore.push(result[i]);
+ }
+ if (length == 0) {
+ for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+ if ($this.$data.refdatastore[j].attr == result[i].attr) {
+ $this.$data.refdatastore[j].value = result[i].value;
}
}
}
}
}
-
+ }
+
}).catch(ex => {
// console.log(ex);
uni.showModal({
@@ -1505,259 +1531,259 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
- .err_info.join('<br/>') : '';
- if (data.ret == 801) {
- if (this.param.Only_Script_Error) {
- let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos + 1);
- }
- uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + this.translateSys('comma') + this.translate('result') + this
- .translateSys('colon') + data.ret,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
- return false
- } else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
- '<br/>') : '';
- if (tip) uni.showModal({
+ if (data.ret != 0) {
+ var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+ .err_info.join('<br/>') : '';
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys("cancel")
});
+ } else uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip + this.translateSys('comma') + this.translate('result') + this
+ .translateSys('colon') + data.ret,
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
+ return false
+ } else {
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
+ '<br/>') : '';
+ if (tip) uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- 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++) {
- if (result[i].choice_list) {
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- for (var c = 0; c < $this.$data.subPanelList[s]
- .subClassAttrList.length; c++) {
- var attr = $this.$data.subPanelList[s].subClassAttrList[c]
- .Attr;
- for (var j = 0; j < attr.length; j++) {
- if (attr[j].Name == result[i].attr) {
- if (utils.classUtils.attrTypeIsDict(attr[j]
- .Type)) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "Name": val,
- "label": val,
- "value": val
- });
- }
- attr[j].dictitem = dictItemList;
- // attr[j].dictitem = result[i].choice_list;
+ var actionlist = data.action;
+ if (actionlist) {
+ console.log(actionlist);
+ 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++) {
+ if (result[i].choice_list) {
+ for (var s = 0; s < $this.$data.subPanelList.length; s++) {
+ for (var c = 0; c < $this.$data.subPanelList[s]
+ .subClassAttrList.length; c++) {
+ var attr = $this.$data.subPanelList[s].subClassAttrList[c]
+ .Attr;
+ for (var j = 0; j < attr.length; j++) {
+ if (attr[j].Name == result[i].attr) {
+ if (utils.classUtils.attrTypeIsDict(attr[j]
+ .Type)) {
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "Name": val,
+ "label": val,
+ "value": val
+ });
}
+ attr[j].dictitem = dictItemList;
+ // attr[j].dictitem = result[i].choice_list;
}
}
}
}
}
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList
- .length; c++) {
- var attr = $this.$data.subPanelList[s].subClassAttrList[c]
- .Attr;
- for (var j = 0; j < attr.length; j++) {
- console.log(attr[j].Name + '==' + result[i].attr);
- if (attr[j].Name == result[i].attr) {
- attr[j].Value = result[i].value;
- // attr.value = '';
- // attr.oldvalue = '';
- // attr.value = result[i].value;
- // attr.oldvalue = result[i].value;
- }
- }
- }
- }
- var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $this.$data.refdatastore.push(result[i]);
- }
- if (length == 0) {
- for (var j = 0; j < $this.$data.refdatastore.length; j++) {
- if ($this.$data.refdatastore[j].attr == result[i].attr) {
- $this.$data.refdatastore[j].value = result[i].value;
+ }
+ for (var s = 0; s < $this.$data.subPanelList.length; s++) {
+ for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList
+ .length; c++) {
+ var attr = $this.$data.subPanelList[s].subClassAttrList[c]
+ .Attr;
+ for (var j = 0; j < attr.length; j++) {
+ console.log(attr[j].Name + '==' + result[i].attr);
+ if (attr[j].Name == result[i].attr) {
+ attr[j].Value = result[i].value;
+ // attr.value = '';
+ // attr.oldvalue = '';
+ // attr.value = result[i].value;
+ // attr.oldvalue = result[i].value;
}
}
}
}
- } else if (action.action_type == 'set_global_attr') {
- $this.$actiontr = action.value || [];
- } else if (action.action_type == 'open_common_dlg') { //鎵撳紑渚ф粦寮规
- var $this = this;
- if (action.value.common_dlg_id == 'check_list') {
- $this.$data.check_list = action.value.config;
- if (action.value.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�- $this.$data.popupType = 'right';
- else
- $this.$data.popupType = 'center'
- // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
- $this.$refs.popup.open($this.$data.popupType);
+ var length = 0;
+ if (!$this.$data.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.$data.refdatastore.push(result[i]);
}
- } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- var result = action.value;
- var $this = this;
- var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
- var scanCodeVal = $this.$data.scanCodeVal;
- var rand = '';
- for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
- rand += Math.floor(Math.random() * 10);
- }
- if (inputParamter[0].attr) {
- if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand;
- }
- if (info.attr[0].attr) {
- if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand;
- }
- $this.$data.subPanelList.push({
- scanCodeVal: scanCodeVal,
- subClassAttr: list_1
- });
- $this.activelist.push({
- active: false
- });
- for (var i = 0; i < result.length; i++) {
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
- if (result[i].attr == "S_ID")
- $this.$data.subPanelList[s].ObjID = result[i].value;
- var _subClassAttr = $this.$data.subPanelList[s].subClassAttr
- .form.items;
- for (var c = 0; c < _subClassAttr.length; c++) {
- if (_subClassAttr[c].name != 'Layout') {
- if (_subClassAttr[c].fieldId == result[i].attr)
- _subClassAttr[c].value = result[i].value;
- } else if (_subClassAttr[c].name == 'Layout') {
- _subClassAttr[c].setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == result[i].attr)
- col.value = result[i].value;
- }
- });
- }
- }
-
- // $this.$data.subPanelList[s].subClassAttr=list_1;
- }
- }
- // console.log($this.$data.subPanelList);
- var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $this.$data.refdatastore.push(result[i]);
- }
- if (length == 0) {
- for (var j = 0; j < $this.$data.refdatastore.length; j++) {
- if ($this.$data.refdatastore[j].attr == result[i].attr) {
- $this.$data.refdatastore[j].value = result[i].value;
- }
+ if (length == 0) {
+ for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+ if ($this.$data.refdatastore[j].attr == result[i].attr) {
+ $this.$data.refdatastore[j].value = result[i].value;
}
}
}
- } else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("quotation_mark_left") + action
- .action_type + this.translateSys(
- "quotation_mark_right") + this.translate(
- "tip_action_unprocessed"),
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
}
+ } else if (action.action_type == 'set_global_attr') {
+ $this.$actiontr = action.value || [];
+ } else if (action.action_type == 'open_common_dlg') { //鎵撳紑渚ф粦寮规
+ var $this = this;
+ if (action.value.common_dlg_id == 'check_list') {
+ $this.$data.check_list = action.value.config;
+ if (action.value.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ $this.$data.popupType = 'right';
+ else
+ $this.$data.popupType = 'center'
+ // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+ $this.$refs.popup.open($this.$data.popupType);
+ }
+ } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ var result = action.value;
+ var $this = this;
+ var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
+ var scanCodeVal = $this.$data.scanCodeVal;
+ var rand = '';
+ for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
+ rand += Math.floor(Math.random() * 10);
+ }
+ if (inputParamter[0].attr) {
+ if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ if (info.attr[0].attr) {
+ if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ $this.$data.subPanelList.push({
+ scanCodeVal: scanCodeVal,
+ subClassAttr: list_1
+ });
+ $this.activelist.push({
+ active: false
+ });
+ for (var i = 0; i < result.length; i++) {
+ for (var s = 0; s < $this.$data.subPanelList.length; s++) {
+ if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
+ if (result[i].attr == "S_ID")
+ $this.$data.subPanelList[s].ObjID = result[i].value;
+ var _subClassAttr = $this.$data.subPanelList[s].subClassAttr
+ .form.items;
+ for (var c = 0; c < _subClassAttr.length; c++) {
+ if (_subClassAttr[c].name != 'Layout') {
+ if (_subClassAttr[c].fieldId == result[i].attr)
+ _subClassAttr[c].value = result[i].value;
+ } else if (_subClassAttr[c].name == 'Layout') {
+ _subClassAttr[c].setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr)
+ col.value = result[i].value;
+ }
+ });
+ }
+ }
+
+ // $this.$data.subPanelList[s].subClassAttr=list_1;
+ }
+ }
+ // console.log($this.$data.subPanelList);
+ var length = 0;
+ if (!$this.$data.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.$data.refdatastore.push(result[i]);
+ }
+ if (length == 0) {
+ for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+ if ($this.$data.refdatastore[j].attr == result[i].attr) {
+ $this.$data.refdatastore[j].value = result[i].value;
+ }
+ }
+ }
+ }
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys("quotation_mark_left") + action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this.translate(
+ "tip_action_unprocessed"),
+ showCancel: false,
+ confirmText: this.translateSys("cancel")
+ });
}
}
+ }
- if (data.result) {
- var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
- var scanCodeVal = $this.$data.scanCodeVal;
- var rand = '';
- for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
- rand += Math.floor(Math.random() * 10);
- }
- if (inputParamter[0].attr) {
- if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand;
- }
- if (info.attr[0].attr) {
- if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand;
- }
- $this.$data.subPanelList.push({
- 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 == scanCodeVal) {
- if (result[i].attr == "S_ID")
- $this.$data.subPanelList[s].ObjID = result[i].value;
- var _subClassAttr = $this.$data.subPanelList[s].subClassAttr.form
- .items;
- for (var c = 0; c < _subClassAttr.length; c++) {
- if (_subClassAttr[c].name != 'Layout') {
- if (_subClassAttr[c].fieldId == result[i].attr)
- _subClassAttr[c].value = result[i].value;
- } else if (_subClassAttr[c].name == 'Layout') {
- _subClassAttr[c].setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == result[i].attr)
- col.value = result[i].value;
- }
- });
- }
+ if (data.result) {
+ var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
+ var scanCodeVal = $this.$data.scanCodeVal;
+ var rand = '';
+ for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
+ rand += Math.floor(Math.random() * 10);
+ }
+ if (inputParamter[0].attr) {
+ if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ if (info.attr[0].attr) {
+ if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ $this.$data.subPanelList.push({
+ 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 == scanCodeVal) {
+ if (result[i].attr == "S_ID")
+ $this.$data.subPanelList[s].ObjID = result[i].value;
+ var _subClassAttr = $this.$data.subPanelList[s].subClassAttr.form
+ .items;
+ for (var c = 0; c < _subClassAttr.length; c++) {
+ if (_subClassAttr[c].name != 'Layout') {
+ if (_subClassAttr[c].fieldId == result[i].attr)
+ _subClassAttr[c].value = result[i].value;
+ } else if (_subClassAttr[c].name == 'Layout') {
+ _subClassAttr[c].setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr)
+ col.value = result[i].value;
+ }
+ });
}
}
}
+ }
- var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $this.$data.refdatastore.push(result[i]);
- }
- if (length == 0) {
- for (var j = 0; j < $this.$data.refdatastore.length; j++) {
- if ($this.$data.refdatastore[j].attr == result[i].attr) {
- $this.$data.refdatastore[j].value = result[i].value;
- }
+ var length = 0;
+ if (!$this.$data.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.$data.refdatastore.push(result[i]);
+ }
+ if (length == 0) {
+ for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+ if ($this.$data.refdatastore[j].attr == result[i].attr) {
+ $this.$data.refdatastore[j].value = result[i].value;
}
}
}
}
}
-
+ }
+
}).catch(ex => {
// console.log(ex);
uni.showModal({
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 993dd89..32bd777 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -88,6 +88,15 @@
<text>{{item.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(item)">
+ <label v-for="(item2) in item.selections" :key="item2.value">
+ <radio :value="item2.value" :checked="item2.value === item.value" />
+ <text>{{item2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
@@ -151,6 +160,16 @@
<text>{{cols.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(cols)">
+ <label v-for="(cols2) in cols.selections" :key="cols2.value">
+ <radio :value="cols2.value"
+ :checked="cols2.value === cols.value" />
+ <text>{{cols2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="cols.name=='Switch'"
:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
@@ -567,8 +586,8 @@
if (item.is_default == '1')
itemName = item.name;
list.push({
- text: item.value,
- value: item.name,
+ text: item.name,
+ value: item.id,
});
});
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index 9a14985..da83c89 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -53,6 +53,15 @@
<text>{{item.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled" :style="{'margin-left':'10rpx'}"
+ @change="onModelValue(item)">
+ <label v-for="(item2) in item.selections" :key="item2.value">
+ <radio :value="item2.value" :checked="item2.value === item.value" />
+ <text>{{item2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
@@ -111,6 +120,15 @@
<text>{{cols.label}}</text>
</label>
</checkbox-group>
+ <!-- 鍗曢�妗�-->
+ <radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled" :style="{'margin-left':'10rpx'}"
+ @change="onModelValue(cols)">
+ <label v-for="(cols2) in cols.selections" :key="cols2.value">
+ <radio :value="cols2.value" :checked="cols2.value === cols.value" />
+ <text>{{cols2.label}}</text>
+ </label>
+ </radio-group>
<!-- Switch寮�叧 -->
<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
:disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)"
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index cf21ec5..5d85cca 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -461,8 +461,8 @@
if (item.is_default == '1')
itemName = item.name;
list.push({
- text: item.value,
- value: item.name,
+ text: item.name,
+ value: item.id,
});
});
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index a5f949c..326a540 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -458,8 +458,8 @@
if (item.is_default == '1')
itemName = item.name;
list.push({
- text: item.value,
- value: item.name,
+ text: item.name,
+ value: item.id,
});
});
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index ebf5d71..6894290 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -473,8 +473,8 @@
if (item.is_default == '1')
itemName = item.name;
list.push({
- text: item.value,
- value: item.name,
+ text: item.name,
+ value: item.id,
});
});
//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
--
Gitblit v1.9.1