From b0041cf10ba3ddf74b9edcfd340a7d1c9179d878 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 03 三月 2025 18:48:19 +0800
Subject: [PATCH] 5601 form
---
pages/modal/3018_2.vue | 52 ++++++++++++++-----------
pages/modal/5601.vue | 56 +++++++++++++++++++++-------
pages/modal/3037_2.vue | 5 +-
manifest.json | 4 +-
4 files changed, 75 insertions(+), 42 deletions(-)
diff --git a/manifest.json b/manifest.json
index ef45b9f..55f1a16 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.43",
- "versionCode" : 1143,
+ "versionName" : "1.1.44",
+ "versionCode" : 1144,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index ac66596..f4f46f6 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -5,24 +5,24 @@
<uni-forms ref="baseForm" label-align="right">
<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
<!-- 鏅�甯冨眬 -->
- <uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label ? item.label +'锛�:'' "
- :label-width="item.labelWidth+'px'">
+ <uni-forms-item v-if="item.name != 'Layout'&& item.show==true"
+ :label="item.label ? item.label +'锛�:'' " :label-width="item.labelWidth+'px'">
<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
<uni-data-select id="dv_select" v-if="item.name=='Select'"
:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
- @change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
+ @change="onChange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
<!-- 鏂囨湰妗�鏁板瓧妗�-->
<view class="input-wrapper" v-if="(item.name=='Input' || item.name=='InputNumber')">
<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
- @change="classAttr_extButton(item)"></text>
+ @click="classAttr_extButton(item)"></text>
<input class="uni-input" :class="item.disabled?'input-disabled':''"
:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
- :style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
+ :style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
:focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)"
- @blur="onevent(item)" :maxlength="-1" />
+ @keyup.enter="onModelValue(item)" @blur="onModelValue(item)" :maxlength="-1" />
<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
@click="classAttr_extButton(item)"></text>
</view>
@@ -68,24 +68,24 @@
<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 v-if="cols!=null && cols.show==true" :label="cols.label? cols.label +'锛�:''"
- :label-width="cols.labelWidth+'px'">
+ <uni-forms-item v-if="cols!=null && cols.show==true"
+ :label="cols.label? cols.label +'锛�:''" :label-width="cols.labelWidth+'px'">
<view class="input-wrapper" v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
- @change="onchange(cols)"></text>
+ @click="classAttr_extButton(cols)"></text>
<input class="uni-input" :class="cols.disabled?'input-disabled':''"
:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder"
- :style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}"
+ :style="{'padding-left':cols.setting.prefix?0 : '8px','right':cols.setting.suffix?0 : '8px'}"
:focus="focusFieldId == cols.fieldId" @focus="ontap(cols)"
@click="onClick(cols)" @blur="onevent(cols)" :maxlength="-1" />
<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
- @click="onchange(cols)"></text>
+ @click="classAttr_extButton(cols)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
<uni-data-select id="dv_select" v-if="cols.name=='Select' "
:class="cols.disabled?'input-disabled':''" v-model="cols.value"
- :localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled"
+ :localdata="cols.dict" @change="onChange(cols)" :disabled="cols.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
<view class="input-wrapper" v-if="cols.name=='Textarea' ">
@@ -151,8 +151,8 @@
<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
<view class="popup-header">{{check_list.title}}</view>
<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
- :style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
- <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+ :style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+ <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -829,8 +829,8 @@
}
},
- onchange(item) {
- console.log("onchange", item);
+ onChange(item) {
+ console.log("onChange", item);
if (item.oldvalue != item.value && item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
@@ -863,8 +863,16 @@
},
onModelValue(item) { //缁戝畾Model鍊� var attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
- console.log(item.value)
+ if (item.oldvalue != item.value && item.value.trim() != "") {
+ item.oldvalue = item.value;
+ var attr = item.fieldId;
+ this.head_styledef.form.model[attr] = item.value;
+ var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.onChange(onChangeEvent);
+ }
+
+ }
},
onCheckBoxValue(e) { //缁戝畾Model鍊� let values = e.detail.value || []
@@ -877,6 +885,7 @@
this.head_styledef.form.model[attr] = value;
},
classAttr_extButton(item) {
+ console.log("classAttr_extButton", item)
var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�
@@ -1402,6 +1411,7 @@
} else if (action.action_type == 'open_common_dlg') {
if (val.common_dlg_id == 'check_list') {
+
$this.setData({
check_list: val.config
})
@@ -2210,7 +2220,7 @@
<style>
.popup-content {
@include flex;
-
+
}
.popup-height {
@@ -2606,10 +2616,6 @@
.demo-uni-col {
height: 36px;
border-radius: 5px;
- }
-
- .demo-uni-row .uni-input {
- width: calc(100% - 120px);
}
.text {
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 6e08aaa..caa6560 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -252,8 +252,8 @@
<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
<view class="popup-header">{{check_list.title}}</view>
<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
- :style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
- <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+ :style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+ <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -1999,7 +1999,6 @@
<style>
.popup-content {
@include flex;
-
}
.popup-height {
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index a6024ec..9657433 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -200,8 +200,8 @@
<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
<view class="popup-header">{{check_list.title}}</view>
<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
- :style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
- <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+ :style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+ <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -925,6 +925,7 @@
getDetailAttrList(pageData) {
const detailAttrList = [];
+ console.log(pageData)
if (pageData.DefList) {
pageData.DefList.forEach(style => {
var detail_attr = {};
@@ -967,6 +968,7 @@
});
});
}
+ console.log(detailAttrList)
const jsonlist = [];
detailAttrList.forEach(attr => {
jsonlist.push({
@@ -998,6 +1000,7 @@
});
var obj_attr = this.head_styledef.form.model;
// console.log(obj_attr);
+
var input_param = Base64.encode(
JSON.stringify(
Object.keys(head_attr).map((a) => ({
@@ -1012,9 +1015,7 @@
jsonList.push({
page_name: page.Name,
- item_list: $this.getDetailAttrList(page
- .DefList, page
- .Select_Button),
+ item_list: $this.getDetailAttrList(page),
ext_data: page.ExtData || {}
})
@@ -1022,6 +1023,7 @@
const data_json = Base64.encode(
JSON.stringify(jsonList)
);
+ console.log(jsonList)
var dataInfo = {
ed_type: 0,
start_transaction: true,
@@ -2399,6 +2401,7 @@
$this.setData({
check_list: val.config
})
+ console.log($this.check_list)
if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� $this.setData({
popupType: "right"
@@ -3255,7 +3258,17 @@
},
};
</script>
+<style>
+ .popup-content {
+ @include flex;
+
+ }
+ .popup-height {
+ @include height;
+ /* width: 200px; */
+ }
+</style>
<style lang="scss">
.uni-page-modal-5601 {
@@ -3591,15 +3604,6 @@
background-color: #f3f3f3 !important;
}
- .demo-uni-row {
- margin-bottom: 0px;
- display: block;
-
- .uni-input {
- width: calc(100% - 120px);
- }
- }
-
::v-deep .uni-row {
margin-bottom: 0px;
}
@@ -3613,6 +3617,30 @@
border-radius: 5px;
}
+ .view-popup {
+ position: relative;
+ }
+
+ .popup-content {
+ // @include flex;
+ align-items: center;
+ justify-content: center;
+ padding: 30rpx;
+ background-color: #fff;
+ /* height: 150px; */
+ /* border: 1px solid red; */
+ }
+
+ .popup-cont {
+ overflow-y: auto;
+ /* border: 1px solid red; */
+ }
+
+ .popup-height {
+ // @include height;
+ /* width: 200px; */
+ }
+
.popup-header {
font-size: 42rpx;
font-weight: bold;
--
Gitblit v1.9.1