From 00814401bba75825126baa6675e542ea3c82a5bb Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 14 三月 2025 12:19:39 +0800
Subject: [PATCH] 日期
---
pages/modal/3018_2.vue | 398 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 246 insertions(+), 152 deletions(-)
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 4c59b99..29fca4f 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -5,48 +5,48 @@
<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 +'锛� "
- :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="onEnterChange(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="onEnterChange(item)" @blur="onEnterChange(item)" :maxlength="-1" />
<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
@click="classAttr_extButton(item)"></text>
</view>
<!-- 澶氳鏂囨湰 -->
<view class="input-wrapper" v-if="item.name=='Textarea' ">
- <textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
+ <textarea class="uni-input" :class="item.disabled?'input-disabled':''" v-model="item.value"
:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
- @blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
+ @blur="onEnterChange(item)" @click="onClick(item)" :data-index="index"
style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea>
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
- :class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
- :disabled="item.disabled" :data-ischeck="item.value">
- <label>
- <checkbox :value="item.value" :checked="item.value" />
- <text>{{item.label}}</text>
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+ @change="onCheckBoxValue" :data-attr="item.fieldId" :data-index="index">
+ <label v-for="(item2) in item.selections" :key="item2.value">
+ <checkbox :value="item2.value" :checked="item.value.includes(item2.value)" />
+ <text>{{item2.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)">
+ @change="onRadioBoxValue" :data-attr="item.fieldId" :data-index="index">
<label v-for="(item2) in item.selections" :key="item2.value">
<radio :value="item2.value" :checked="item2.value === item.value" />
<text>{{item2.label}}</text>
@@ -57,58 +57,71 @@
:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
@change="onModelValue(item)" />
<!-- 鏃ユ湡鏃堕棿 -->
- <view class="input-wrapper" v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
+ <!-- <view class="input-wrapper" v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
<view class="picker">{{item.value}}</view>
</picker>
- </view>
+ </view> -->
+ <OIDatePicker v-if="item.name=='DatePicker'" :class="item.disabled?'input-disabled':''"
+ :disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
+ :defaultToday="item.setting.defaultToday" :format="item.setting.format"
+ @change="onModelValue(item)" />
+ <OIDatePickerRange v-if="item.name=='DatePickerRange'" :rangeSeparator="item.setting.separator"
+ :format="item.setting.format" :class="item.disabled?'input-disabled':''"
+ :disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
+ @change="onModelValue(item)" />
+ <OITimePicker v-if="item.name=='TimePicker'" :class="item.disabled?'input-disabled':''"
+ :disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
+ @change="onModelValue(item)" />
</uni-forms-item>
<!-- 鏍呮牸甯冨眬 -->
<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 +'锛�"
- :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" />
+ @click="onClick(cols)" @keyup.enter="onEnterChange(cols)"
+ @blur="onEnterChange(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="onEnterChange(cols)" :disabled="cols.disabled"
:clear="false"></uni-data-select>
<!-- 澶氳鏂囨湰 -->
<view class="input-wrapper" v-if="cols.name=='Textarea' ">
- <textarea class="uni-input" :value="cols.value"
+ <textarea class="uni-input" v-model="cols.value"
:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
- :focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
+ :focus="focusFieldId == cols.fieldId" @blur="onEnterChange(cols)"
@click="onClick(cols)" style="height:60px;" :style="{'width':'96%'}"
:disabled="cols.disabled"></textarea>
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
- @change="onModelValue(cols)" :data-ischeck="cols.value"
- :style="{'margin-left':'10rpx'}">
- <label>
- <checkbox :value="cols.value" :checked="cols.value" />
- <text>{{cols.label}}</text>
+ @change="onCheckBoxValue" :data-attr="cols.fieldId" :data-index="index"
+ :data-iindex="key">
+ <label v-for="(cols2) in cols.selections" :key="cols2.value">
+ <checkbox :value="cols2.value" :checked="cols.value.includes(cols2.value)" />
+ <text>{{cols2.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)">
+ @change="onRadioBoxValue" :data-attr="cols.fieldId" :data-index="index"
+ :data-iindex="key">
<label v-for="(cols2) in cols.selections" :key="cols2.value">
<radio :value="cols2.value" :checked="cols2.value === cols.value" />
<text>{{cols2.label}}</text>
@@ -119,15 +132,27 @@
:disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
:style="{'margin-left':'10rpx'}" />
<!-- 鏃ユ湡鏃堕棿 -->
- <view class="input-wrapper"
+ <!-- <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="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
<view class="picker">{{cols.value}}</view>
</picker>
- </view>
-
+ </view> -->
+ <OIDatePicker v-if="cols.name=='DatePicker'" :class="cols.disabled?'input-disabled':''"
+ :disabled="cols.disabled" v-model="cols.value" :placeholder="cols.placeholder"
+ :defaultToday="cols.setting.defaultToday" :format="cols.setting.format"
+ @change="onModelValue(cols)" />
+ <OIDatePickerRange v-if="cols.name=='DatePickerRange'"
+ :rangeSeparator="cols.setting.separator" :format="cols.setting.format"
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+ v-model="cols.value" :placeholder="cols.placeholder" @change="onModelValue(cols)" />
+ <OITimePicker v-if="cols.name=='TimePicker'" :class="cols.disabled?'input-disabled':''"
+ :disabled="cols.disabled" v-model="cols.value" :placeholder="cols.placeholder"
+ @change="onModelValue(cols)" />
</uni-forms-item>
+ <uni-forms-item v-else label=""></uni-forms-item>
+
</uni-col>
</uni-row>
</view>
@@ -152,8 +177,9 @@
<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'}">
@@ -178,6 +204,11 @@
<script>
import Base64 from '../../components/js-base64/base64.js'
import utils from "@/js/utils.js"
+ import dayjs from "dayjs";
+ import OIDatePicker from '@/components/oi-date-time-picker/oi-date-picker.vue'
+ import OIDatePickerRange from '@/components/oi-date-time-picker/oi-date-picker-range.vue'
+ import OITimePicker from '@/components/oi-date-time-picker/oi-time-picker.vue'
+
import {
appGetInfo,
dictGetInfo
@@ -191,6 +222,11 @@
export default {
modules: {
Base64,
+ },
+ components: {
+ OIDatePicker,
+ OIDatePickerRange,
+ OITimePicker
},
data() {
return {
@@ -388,6 +424,21 @@
await $this.DictGetInfo(ele.bind.dict,
styledefHead.form.model,
ele);
+ } else {
+ if (ele?.name === "Select") {
+ const selections = ele?.selections || []
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ let itemName = ele.value || "";
+ if (itemName) {
+ styledefHead.form.model[ele.fieldId] = itemName;
+ }
+ ele.dict = selections.map((a) => {
+ return {
+ value: a.value,
+ text: a.label
+ }
+ })
+ }
}
if ($this.focusFieldId == "") {
if (ele.name == 'Input' || ele.name ==
@@ -408,6 +459,22 @@
.dict,
styledefHead.form
.model, col);
+ } else {
+ if (col?.name === "Select") {
+ const selections = col?.selections || []
+ //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+ let itemName = col.value || "";
+ if (itemName) {
+ styledefHead.form
+ .model[col.fieldId] = itemName;
+ }
+ col.dict = selections.map((a) => {
+ return {
+ value: a.value,
+ text: a.label
+ }
+ })
+ }
}
if ($this.focusFieldId == "") {
if (col.name == 'Input' || col
@@ -451,7 +518,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -491,7 +558,7 @@
title: this.translateSys("error") + "1.3",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
@@ -523,14 +590,14 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
content: tip + ',' + this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -542,7 +609,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -593,7 +660,7 @@
"quotation_mark_right") + this
.translate('tip_action_unprocessed'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -611,7 +678,7 @@
this.translateSys("full_stop") +
this.translate('reason') + this.translateSys("colon") + tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -761,71 +828,105 @@
// console.log("onClick",item);
this.focusFieldId = item.fieldId
},
- onevent(item) {
- // console.log("onevent",item);
- if (item.oldvalue != item.value && item.value.trim() != "") {
+ onEnterChange(item) {
+ console.log("onEnterChange", item);
+ if (item.oldvalue != item.value) {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
- //瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�- var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�- if (eventid) {
- var obj_attr = this.head_styledef.form.model;
- // console.log(obj_attr);
- var req = Object.keys(obj_attr).map((a) => ({
- attr: a,
- value: obj_attr[a] || "",
- }));
- var info = {
- eventid: eventid,
- edtype: "0",
- projectid: '',
- rclsid: '',
- robjid: '',
- userlogin: '',
- clsid: this.$data.param.DataCls.id,
- objid: "",
- attr: req,
- dataJson: [],
- }
- this.DataObjRunCustomEvent(info, "");
+ var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.onChange(onChangeEvent);
}
}
},
- onchange(item) {
- console.log("onchange", item);
- 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 eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�- if (eventid) {
- // self.event_no_sub = 1;
- var obj_attr = this.head_styledef.form.model;
- // console.log(obj_attr);
- var req = Object.keys(obj_attr).map((a) => ({
- attr: a,
- value: obj_attr[a] || "",
- }));
- var info = {
- eventid: eventid,
- edtype: "0",
- projectid: '',
- rclsid: '',
- robjid: '',
- userlogin: '',
- clsid: this.$data.param.DataCls.id,
- objid: "",
- attr: req,
- dataJson: []
+ // 鍐呭鍙樺寲鍚庝簨浠�+ async onChange(event) {
+ var eventid = event?.id; //鍐呭鍙樺寲鍚庝簨浠�+ if (eventid) {
+ // self.event_no_sub = 1;
+ var obj_attr = this.head_styledef.form.model;
+ // console.log(obj_attr);
+ var req = Object.keys(obj_attr).map((a) => ({
+ attr: a,
+ value: obj_attr[a] || "",
+ }));
+ var info = {
+ eventid: eventid,
+ edtype: "0",
+ projectid: '',
+ rclsid: '',
+ robjid: '',
+ userlogin: '',
+ clsid: this.$data.param.DataCls.id,
+ objid: "",
+ attr: req,
+ dataJson: []
+ }
+ this.DataObjRunCustomEvent(info);
+ }
+
+ },
+
+ onCheckBoxValue(e) { //缁戝畾Model鍊�+ let values = e.detail.value || []
+ const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
+ if (item?.setting?.colList) {
+ const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
+ if (col) {
+ col.value = values
+ let attr = col.fieldId;
+ this.head_styledef.form.model[attr] = col.value;
+ var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.onChange(onChangeEvent);
}
- this.DataObjRunCustomEvent(info);
+ return
+ }
+ } else {
+ if (item) {
+ item.value = values
+ let attr = item.fieldId;
+ this.head_styledef.form.model[attr] = item.value;
+ var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.onChange(onChangeEvent);
+ }
}
}
},
- onModelValue(item) { //缁戝畾Model鍊�+ onRadioBoxValue(e) { //缁戝畾Model鍊�+ let values = e.detail.value || ""
+ const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
+ if (item?.setting?.colList) {
+ const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
+ if (col) {
+ col.value = values
+ let attr = col.fieldId;
+ this.head_styledef.form.model[attr] = col.value;
+ var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.onChange(onChangeEvent);
+ }
+ return
+ }
+ } else {
+ if (item) {
+ item.value = values
+ let attr = item.fieldId;
+ this.head_styledef.form.model[attr] = item.value;
+ var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+ this.onChange(onChangeEvent);
+ }
+ }
+
+ }
+
+ },
+ onModelValue(item) {
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
},
@@ -838,7 +939,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_callback_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -847,7 +948,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_event_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -855,7 +956,7 @@
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
this.$refs.popup.open(this.popupType);
- this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+ this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
item);
},
popupChange(e) {
@@ -900,7 +1001,7 @@
title: this.translateSys("tip"),
content: "popupParam涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -909,7 +1010,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1012,14 +1113,14 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
content: tip + ',' + this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -1031,7 +1132,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1051,22 +1152,18 @@
} else if (action.action_type ==
"set_dlg_current_edit_attr"
) {
- if ($this
- .focusOldFieldId ==
- action.value) {
+ if ($this.focusOldFieldId == action.value) {
$this.setData({
focusFieldId: ""
})
} else {
$this.setData({
- focusFieldId: $this
- .focusOldFieldId
+ focusFieldId: $this.focusOldFieldId
})
}
$this.$nextTick(() => {
$this.setData({
- focusFieldId: action
- .value
+ focusFieldId: action.value
})
});
} else {
@@ -1080,7 +1177,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -1161,7 +1258,7 @@
title: this.translateSys("error") + "3.1",
content: exStr,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1253,14 +1350,14 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
} else uni.showModal({
title: $this.translateSys("tip"),
content: tip + ',' + $this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
return false
} else {
@@ -1272,7 +1369,7 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
if (data != "") {
@@ -1288,13 +1385,10 @@
var d = dialog({
title: '<i class="ace-icon fa fa-info-circle"></i> ' +
$this.translateSys("tip"),
- content: $this.translateSys(
- "quotation_mark_left") +
- action
- .action_type + $this.translateSys(
- "quotation_mark_right") + $this
- .translate(
- "tip_action_unprocessed")
+ content: $this.translateSys("quotation_mark_left") +
+ action.action_type + $this.translateSys(
+ "quotation_mark_right") +
+ $this.translate("tip_action_unprocessed")
});
d.show();
} else if (action.action_type == 'open_select_userdlg') {
@@ -1355,6 +1449,7 @@
} else if (action.action_type == 'open_common_dlg') {
if (val.common_dlg_id == 'check_list') {
+
$this.setData({
check_list: val.config
})
@@ -1450,7 +1545,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -1463,7 +1558,7 @@
"quotation_mark_right") + $this.translateSys(
"comma") + 'event_id' + eventid,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -1478,7 +1573,7 @@
title: $this.translateSys('tip') + "5.1",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
});
},
@@ -1556,14 +1651,14 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
content: tip + ',' + this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
this.saving = false
return false
@@ -1576,7 +1671,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
else {
@@ -1648,7 +1743,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1858,14 +1953,14 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
content: tip + ',' + this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
this.saving = false
return false
@@ -1878,7 +1973,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
if (!this.$data.param.After_Btn_Not_Refresh) {
//鍒锋柊
@@ -1938,7 +2033,7 @@
title: this.translateSys('tip') + "7.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1976,7 +2071,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
} else if (btn.FunCode == "TriggerEvent") {
@@ -2031,14 +2126,14 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
content: tip + ',' + this.translateSys('tip') + ':' + data
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -2050,7 +2145,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
if (!this.$data.param.After_Btn_Not_Refresh) {
//鍒锋柊
@@ -2108,7 +2203,7 @@
title: this.translateSys('tip') + "7.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
});
@@ -2216,7 +2311,7 @@
}
.uni-icon {
- padding: 8rpx;
+ padding: 10rpx 5rpx;
font-size: 32rpx;
color: rgb(192, 196, 204);
}
@@ -2237,7 +2332,7 @@
.uni-icon {
/* border: 1px solid red; */
- width: 8%;
+ width: 30rpx;
font-family: uniicons;
font-size: 40rpx;
font-weight: 400;
@@ -2276,9 +2371,10 @@
width: 45%;
margin: 0 10rpx;
// padding: 5rpx 10rpx;
- background: #4D6AF4;
+ background: #27A6E1;
border: none;
color: #fff;
+ font-size: 38rpx;
float: left;
display: inline-block;
}
@@ -2293,7 +2389,7 @@
margin: 0 10rpx;
background: #fff;
border: none;
- color: #000;
+ //color: #000;
font-size: 38rpx;
float: right;
display: inline-block;
@@ -2303,7 +2399,7 @@
width: 90%;
margin: 0 10rpx;
background: #fff;
- border: none;
+ // border: none;
color: #000;
font-size: 38rpx;
float: right;
@@ -2367,7 +2463,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -2391,9 +2487,11 @@
margin-top: 50rpx;
padding: 15rpx;
line-height: 1.5;
- background: #27A6E1;
- border: none;
- color: #fff;
+ // background: #27A6E1;
+ // border: none;
+ // color: #fff;
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
/* float: right; */
@@ -2559,10 +2657,6 @@
.demo-uni-col {
height: 36px;
border-radius: 5px;
- }
-
- .demo-uni-row .uni-input {
- width: calc(100% - 120px);
}
.text {
--
Gitblit v1.9.1