From aae423f3b0b7c9e2396e5762b7cfaddcb27a3088 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 07 十一月 2023 18:55:53 +0800
Subject: [PATCH] #
---
pages/business/goBusiness/addgoBusiness.vue | 85 ++++++++++++++++++++++++++++++++----------
uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue | 10 +++-
2 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/pages/business/goBusiness/addgoBusiness.vue b/pages/business/goBusiness/addgoBusiness.vue
index fb5d037..7a45756 100644
--- a/pages/business/goBusiness/addgoBusiness.vue
+++ b/pages/business/goBusiness/addgoBusiness.vue
@@ -11,8 +11,8 @@
<view class="flex"><text class="card-required" v-show="subItem.required">*</text>{{subItem.subTitle}}</view>
<view class="flex">
<view style="flex: 1;">
- <input type="text" placeholder="璇疯緭鍏ュ嚭宸簨鐢�1" :placeholder-style="placeholderStyle" v-model="subItem.value" :disabled="subItem.disabled" v-show="subItem.inputType != 'data'">
- <uni-datetime-picker v-model="subItem.value" :border="false" v-show="subItem.inputType == 'data'" />
+ <input type="text" :placeholder="subItem.placeholder" :placeholder-style="subItem.placeholderStyle" v-model="subItem.value" :disabled="subItem.disabled" v-show="subItem.inputType != 'data'">
+ <uni-datetime-picker v-model="subItem.value" :border="false" :red-color="subItem.placeholderStyle" v-if="subItem.inputType == 'data'" />
</view>
<view class="flex" style="width: 50rpx;" v-show="subItem.inputType == 'select'" @click="showPicker(subItem.type)"><uni-icons type="right" color="#000" ></uni-icons></view>
@@ -25,6 +25,7 @@
<u-picker :show="businessTransportationShow" :columns="businessTransportations" @confirm="businessTransportationConfirm"></u-picker>
<u-picker :show="businessReturnShow" :columns="businessReturns" @confirm="businessReturnConfirm"></u-picker>
<u-picker :show="pcdShow" ref="uPicker" :columns="columns" @confirm="pcdStartConfirm" @change="changeHandler" :defaultIndex="defaultIndex"></u-picker>
+ <u-picker :show="pcdEndShow" ref="uPicker" :columns="columns" @confirm="pcdEndConfirm" @change="changeHandler" :defaultIndex="defaultIndex"></u-picker>
<u-picker :show="businessStartTimeDayShow" :columns="businessStartTimeDays" @confirm="businessStartTimeDayConfirm"></u-picker>
<u-picker :show="businessEndTimeDayShow" :columns="businessEndTimeDays" @confirm="businessEndTimeDayConfirm"></u-picker>
@@ -43,11 +44,12 @@
export default {
data() {
return {
- year: '',
+ year: '2021-5-3',
placeholderStyle: 'font-size:20rpx',
form: {
// businessTripReasons: ''
},
+ redColor: '',
columns: [],
defaultIndex: [],
citysData: data.citysData,
@@ -56,6 +58,7 @@
businessReturnShow: false,
businessReturns: [['鍗曠▼','寰�杩�']],
pcdShow: false,
+ pcdEndShow: false,
pcds: data.citysData,
businessStartTimeDayShow: false,
businessStartTimeDays: [['涓婂崍','涓嬪崍']],
@@ -63,27 +66,27 @@
businessEndTimeDays: [['涓婂崍','涓嬪崍']],
form2: [
{title: '鍩烘湰淇℃伅',info:[
- {subTitle: '鍑哄樊浜嬬敱',value: '',submitVal: '鍑哄樊浜嬬敱',type: 'businessTripReasons',inputType: 'input',required: true}
+ {subTitle: '鍑哄樊浜嬬敱',placeholder: '璇疯緭鍏ュ嚭宸簨鐢�',placeholderStyle: 'font-size:20rpx', value: '',submitVal: '鍑哄樊浜嬬敱',type: 'businessTripReasons',inputType: 'input',required: true}
]},
{title: '琛岀▼淇℃伅',info:[
- {subTitle: '浜ら�氬伐鍏�',value: '',type: 'businessTransportation',inputType: 'select',disabled:true,required: true},
- {subTitle: '鍗曠▼寰�杩�',value: '',type: 'businessReturn',inputType: 'select',disabled:true,required: true},
- {subTitle: '杞︾墝鍙�',value: '',type: 'carNumber',inputType: 'input',required: true},
- {subTitle: '琛岀▼鏄庣粏鍙婂叕閲屾暟',value: '',type: 'kilometers',inputType: 'input',required: true},
- {subTitle: '鍑哄彂鍦�',value: '',type: 'pcdStart',inputType: 'select',required: true},
- {subTitle: '鍑哄彂鍦拌缁嗗湴鍧�',value: '',type: 'businessStartAddr',inputType: 'input',required: true},
- {subTitle: '鐩殑鍦�',value: '',type: 'pcdEnd',inputType: 'select',required: true},
- {subTitle: '鐩殑鍦拌缁嗗湴鍧�',value: '',type: 'businessEndAddr',inputType: 'input',required: true},
+ {subTitle: '浜ら�氬伐鍏�',placeholder: '璇烽�夋嫨浜ら�氬伐鍏�',placeholderStyle: 'font-size:20rpx',value: '',type: 'businessTransportation',inputType: 'select',disabled:true,required: true},
+ {subTitle: '鍗曠▼寰�杩�',placeholder: '璇烽�夋嫨鍗曠▼鍗曠▼',placeholderStyle: 'font-size:20rpx',value: '',type: 'businessReturn',inputType: 'select',disabled:true,required: true},
+ {subTitle: '杞︾墝鍙�',placeholder: '璇疯緭鍏ヨ溅鐗屽彿',placeholderStyle: 'font-size:20rpx',value: '',type: 'carNumber',inputType: 'input',required: true},
+ {subTitle: '琛岀▼鏄庣粏鍙婂叕閲屾暟',placeholder: '璇疯緭鍏ヨ绋嬫槑缁嗗強鍏噷鏁�',placeholderStyle: 'font-size:20rpx',value: '',type: 'kilometers',inputType: 'input',required: true},
+ {subTitle: '鍑哄彂鍦�',placeholder: '璇烽�夋嫨鍑哄彂鍦�',placeholderStyle: 'font-size:20rpx',value: '',type: 'pcdStart',inputType: 'select',disabled:true,required: true},
+ {subTitle: '鍑哄彂鍦拌缁嗗湴鍧�',placeholder: '璇疯緭鍏ュ嚭鍙戝湴璇︾粏鍦板潃',placeholderStyle: 'font-size:20rpx',value: '',type: 'businessStartAddr',inputType: 'input',required: true},
+ {subTitle: '鐩殑鍦�',placeholder: '璇烽�夋嫨鐩殑鍦�',placeholderStyle: 'font-size:20rpx',value: '',type: 'pcdEnd',inputType: 'select',disabled:true,required: true},
+ {subTitle: '鐩殑鍦拌缁嗗湴鍧�',placeholder: '璇疯緭鍏ョ洰鐨勫湴璇︾粏鍦板潃',placeholderStyle: 'font-size:20rpx',value: '',type: 'businessEndAddr',inputType: 'input',required: true},
]},
{title: '鏃ユ湡淇℃伅',info:[
- {subTitle: '鍑哄彂鏃ユ湡',value: '',type: 'businessStartTime',inputType: 'data',required: true},
- {subTitle: '鍑哄彂鏃惰景',value: '',type: 'businessStartTimeDay',inputType: 'select',required: true},
- {subTitle: '缁撴潫鏃ユ湡',value: '',type: 'businessEndTime',inputType: 'data',required: true},
- {subTitle: '缁撴潫鏃惰景',value: '',type: 'businessEndTimeDay',inputType: 'select',required: true}
+ {subTitle: '鍑哄彂鏃ユ湡',placeholder: '璇烽�夋嫨鍑哄彂鏃ユ湡',placeholderStyle: 'font-size:20rpx',value: '2021-5-3',type: 'businessStartTime',inputType: 'data',required: true},
+ {subTitle: '鍑哄彂鏃惰景',placeholder: '璇烽�夋嫨鍑哄彂鏃惰景',placeholderStyle: 'font-size:20rpx',value: '',type: 'businessStartTimeDay',inputType: 'select',disabled:true,required: true},
+ {subTitle: '缁撴潫鏃ユ湡',placeholder: '璇烽�夋嫨缁撴潫鏃ユ湡',placeholderStyle: 'font-size:20rpx',value: '2021-5-3',type: 'businessEndTime',inputType: 'data',required: true},
+ {subTitle: '缁撴潫鏃惰景',placeholder: '璇烽�夋嫨缁撴潫鏃惰景',placeholderStyle: 'font-size:20rpx',value: '',type: 'businessEndTimeDay',inputType: 'select',disabled:true,required: true}
]},
{title: '鍩烘湰淇℃伅',info:[
- {subTitle: '鍚岃浜�',value: '鍚岃浜�',type: 'businessPeers',inputType: 'input',required: true},
- {subTitle: '澶囨敞',value: '澶囨敞',inputType: 'input',type: 'businessNotes'}
+ {subTitle: '鍚岃浜�',placeholder: '璇疯緭鍏ュ悓琛屼汉',placeholderStyle: 'font-size:20rpx',value: '鍚岃浜�',type: 'businessPeers',inputType: 'input',required: true},
+ {subTitle: '澶囨敞',placeholder: '澶囨敞淇℃伅',placeholderStyle: 'font-size:20rpx',value: '澶囨敞',inputType: 'input',type: 'businessNotes'}
]},
],
@@ -178,6 +181,7 @@
}
},
submit() {
+ let subPass = true
for (let k of this.form2) {
for (let sub of k.info) {
if (sub.inputType == 'select') {
@@ -185,9 +189,23 @@
} else {
this.form[sub.type] = sub.value
}
+ if (sub.required) {
+ sub.placeholderStyle = 'font-size:20rpx;'
+ if (sub.value == '' || (sub.submitVal == '' && sub.submitVal < 0)) {
+ console.log(sub);
+ sub.placeholderStyle = 'font-size:20rpx;color:red'
+ subPass = false
+ }
+ }
+
}
}
console.log(this.form);
+ console.log(subPass);
+ if(subPass) {
+ console.log(this.form);
+ }
+
},
showPicker(e) {
switch(e) {
@@ -199,6 +217,9 @@
break
case 'pcdStart':
this.pcdShow = true
+ break
+ case 'pcdEnd':
+ this.pcdEndShow = true
break
case 'businessStartTimeDay':
this.businessStartTimeDayShow = true
@@ -248,7 +269,7 @@
}
},
pcdStartConfirm(e) {
- console.log('confirm', e)
+ // console.log('confirm', e)
let pcd = data.citysData
pcd[e.indexs[0]]
// console.log(pcd[e.indexs[0]]);
@@ -256,12 +277,34 @@
// console.log(e.indexs)
let shen = data.citysData[e.indexs[0]]
- console.log(shen.value, shen.text)
+ // console.log(shen.value, shen.text)
let shi = shen.children[e.indexs[1]]
// console.log(shi.value, shi.code)
let qu = shi.children[e.indexs[2]]
// console.log(qu.value, qu.code)
- console.log(shen.value , shi.value, qu.value);
+ // console.log(shen.value , shi.value, qu.value);
+ this.form2[1].info[4].value = e.value[0] + '/' + e.value[1] + '/' + e.value[2]
+ this.form2[1].info[4].submitVal = shen.value + ',' + shi.value + ',' + qu.value
+ console.log(this.form2[1].info[4].value,this.form2[1].info[4].submitVal);
+ },
+ pcdEndConfirm(e) {
+ // console.log('confirm', e)
+ let pcd = data.citysData
+ pcd[e.indexs[0]]
+ // console.log(pcd[e.indexs[0]]);
+ this.pcdEndShow = false
+
+ // console.log(e.indexs)
+ let shen = data.citysData[e.indexs[0]]
+ // console.log(shen.value, shen.text)
+ let shi = shen.children[e.indexs[1]]
+ // console.log(shi.value, shi.code)
+ let qu = shi.children[e.indexs[2]]
+ // console.log(qu.value, qu.code)
+ // console.log(shen.value , shi.value, qu.value);
+ this.form2[1].info[6].value = e.value[0] + '/' + e.value[1] + '/' + e.value[2]
+ this.form2[1].info[6].submitVal = shen.value + ',' + shi.value + ',' + qu.value
+ console.log(this.form2[1].info[6].value,this.form2[1].info[6].submitVal);
}
}
}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
index e844331..f0e24dc 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -5,9 +5,9 @@
<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
'uni-date-x--border': border}">
<view v-if="!isRange" class="uni-date-x uni-date-single">
- <uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+ <!-- <uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons> -->
<input class="uni-date__x-input" type="text" v-model="singleVal"
- :placeholder="singlePlaceholderText" :disabled="true" />
+ :placeholder="singlePlaceholderText" :placeholder-style="redColor" :disabled="true" />
</view>
<view v-else class="uni-date-x uni-date-range">
<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
@@ -208,6 +208,10 @@
default: 'string'
},
placeholder: {
+ type: String,
+ default: ''
+ },
+ redColor: {
type: String,
default: ''
},
@@ -768,7 +772,7 @@
flex-direction: row;
align-items: center;
justify-content: center;
- padding: 0 10px;
+ padding: 0 0px;
border-radius: 4px;
background-color: #fff;
color: #666;
--
Gitblit v1.9.1