|
|
@@ -18,14 +18,18 @@
|
|
|
</view>
|
|
|
<view class="register_li2">
|
|
|
<view class="period" v-if="pageType==0">
|
|
|
- <view class="period_l"><i>*</i>使用时间</view>
|
|
|
+ <view class="period_l"><i>*</i>开始时间</view>
|
|
|
<view class="period_r">
|
|
|
- <picker mode="date" @change="startChange(form,$event)" :disabled="isCustom">
|
|
|
- <input class="picker-text" disabled type="text" v-model="form.startTime" placeholder="开始时间">
|
|
|
+ <picker mode="multiSelector" @change="changeDateTime" @columnchange="changeDateTimeColumn" :range="dateTimeArray">
|
|
|
+ <input class="picker-text" disabled type="text" v-model="form.usageStartTime" placeholder="开始时间">
|
|
|
</picker>
|
|
|
- <view>至</view>
|
|
|
- <picker mode="date" @change="endChange(form,$event)" :disabled="isCustom">
|
|
|
- <input class="picker-text2" disabled type="text" v-model="form.endTime" placeholder="结束时间">
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="period" v-if="pageType==0">
|
|
|
+ <view class="period_l"><i>*</i>结束时间</view>
|
|
|
+ <view class="period_r">
|
|
|
+ <picker mode="multiSelector" @change="changeDateTime2" @columnchange="changeDateTimeColumn" :range="dateTimeArray">
|
|
|
+ <input class="picker-text" disabled type="text" v-model="form.usageEndTime" placeholder="结束时间">
|
|
|
</picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -63,6 +67,7 @@
|
|
|
<script>
|
|
|
import { useRegisterDetail,useRegisterAdd,airbottleStockFindByBeaconTag,airbottleUsageRecordAdd} from '@/api/index.js'
|
|
|
import { config } from '@/api/request/config.js'
|
|
|
+ import { dateTimePicker,getMonthDay} from '@/api/../component/date.js'
|
|
|
export default {
|
|
|
|
|
|
name: "gasRecycle",
|
|
|
@@ -90,9 +95,17 @@
|
|
|
specificationName:{},
|
|
|
currentStatus:null,
|
|
|
beaconTag:'',
|
|
|
+ //时间年月日时分秒
|
|
|
+ dateTime: null,
|
|
|
+ dateTimeArray: null,
|
|
|
+ startYear: 0,
|
|
|
+ endYear: 0,
|
|
|
+ timeStr:''
|
|
|
}
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
+ this.currentDateFun()
|
|
|
+ this.initTime()
|
|
|
if(option.beaconTag){
|
|
|
this.beaconTag=option.beaconTag;
|
|
|
}
|
|
|
@@ -103,8 +116,57 @@
|
|
|
},
|
|
|
mounted(){
|
|
|
this.getInfo()
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
+ currentDateFun(){
|
|
|
+ let date = new Date(); //Fri Oct 29 2021 16:37:56 GMT+0800 (CST)
|
|
|
+ this.startYear= date.getFullYear(); //获取完整的年份(4位)
|
|
|
+ this.endYear= date.getFullYear()+70;
|
|
|
+ },
|
|
|
+ initTime(){
|
|
|
+ let date = new Date();
|
|
|
+ let endYear = date.getFullYear();
|
|
|
+ // 获取完整的年月日 时分秒，以及默认显示的数组
|
|
|
+ let obj = dateTimePicker(this.startYear, this.endYear);
|
|
|
+ // 精确到分的处理，将数组的秒去掉
|
|
|
+ // let lastArray = obj.dateTimeArray.pop();
|
|
|
+ // let lastTime = obj.dateTime.pop();
|
|
|
+
|
|
|
+ this.dateTimeArray=obj.dateTimeArray
|
|
|
+ this.dateTime=obj.dateTime
|
|
|
+ },
|
|
|
+ //开始时间
|
|
|
+ changeDateTime(e) {
|
|
|
+ this.dateTime = e.detail.value;
|
|
|
+ this.form.usageStartTime= this.createTimeStr(this.dateTimeArray,this.dateTime);
|
|
|
+ //ios时间不能用'-'解析成时间戳
|
|
|
+ },
|
|
|
+ //结束时间
|
|
|
+ changeDateTime2(e) {
|
|
|
+ this.dateTime = e.detail.value;
|
|
|
+ this.form.usageEndTime= this.createTimeStr(this.dateTimeArray,this.dateTime);
|
|
|
+ //ios时间不能用'-'解析成时间戳
|
|
|
+ },
|
|
|
+ /*年,月切换时重新更新计算*/
|
|
|
+ changeDateTimeColumn(e) {
|
|
|
+ //let {id} = e.target;
|
|
|
+ let {column,value} = e.detail;
|
|
|
+ if(column==0 || column==1){
|
|
|
+ //直接修改数组下标视图不更新,用深拷贝之后替换数组
|
|
|
+ let dateTime = JSON.parse(JSON.stringify(this.dateTime));
|
|
|
+ let dateTimeArray = JSON.parse(JSON.stringify(this.dateTimeArray));
|
|
|
+ dateTime[column] = value;
|
|
|
+ dateTimeArray[2] = getMonthDay(dateTimeArray[0][dateTime[0]], dateTimeArray[1][dateTime[1]]);
|
|
|
+ this.dateTime = dateTime;
|
|
|
+ this.dateTimeArray = dateTimeArray;
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ createTimeStr(dateTimeArray,dateTime){
|
|
|
+ let timeStr = dateTimeArray[0][dateTime[0]]+'-'+dateTimeArray[1][dateTime[1]]+'-'+dateTimeArray[2][dateTime[2]]+' '+dateTimeArray[3][dateTime[3]]+":"+dateTimeArray[4][dateTime[4]];
|
|
|
+ return timeStr
|
|
|
+ },
|
|
|
//点击事件
|
|
|
handleClick(doType) {
|
|
|
let _this=this;
|
|
|
@@ -124,32 +186,32 @@
|
|
|
}
|
|
|
this.$set(this.form,'usageAmount',num)
|
|
|
},
|
|
|
- //开始时间选中事件
|
|
|
- startChange(form,e){
|
|
|
- if(new Date(e.target.value).getTime()>new Date(this.form.endTime).getTime()){
|
|
|
- uni.showToast({
|
|
|
- title: '结束时间不能小于开始时间',
|
|
|
- icon:"none",
|
|
|
- mask:true,
|
|
|
- duration: 2000
|
|
|
- });
|
|
|
- }else{
|
|
|
- this.$set(this.form,'startTime',e.target.value);
|
|
|
- }
|
|
|
- },
|
|
|
- //结束时间选中事件
|
|
|
- endChange(form,e){
|
|
|
- if(new Date(this.form.startTime).getTime()>new Date(e.target.value).getTime()){
|
|
|
- uni.showToast({
|
|
|
- title: '结束时间不能小于开始时间',
|
|
|
- icon:"none",
|
|
|
- mask:true,
|
|
|
- duration: 2000
|
|
|
- });
|
|
|
- }else{
|
|
|
- this.$set(this.form,'endTime',e.target.value);
|
|
|
- }
|
|
|
- },
|
|
|
+ // //开始时间选中事件
|
|
|
+ // startChange(form,e){
|
|
|
+ // if(new Date(e.target.value).getTime()>new Date(this.form.endTime).getTime()){
|
|
|
+ // uni.showToast({
|
|
|
+ // title: '结束时间不能小于开始时间',
|
|
|
+ // icon:"none",
|
|
|
+ // mask:true,
|
|
|
+ // duration: 2000
|
|
|
+ // });
|
|
|
+ // }else{
|
|
|
+ // this.$set(this.form,'startTime',e.target.value);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // //结束时间选中事件
|
|
|
+ // endChange(form,e){
|
|
|
+ // if(new Date(this.form.startTime).getTime()>new Date(e.target.value).getTime()){
|
|
|
+ // uni.showToast({
|
|
|
+ // title: '结束时间不能小于开始时间',
|
|
|
+ // icon:"none",
|
|
|
+ // mask:true,
|
|
|
+ // duration: 2000
|
|
|
+ // });
|
|
|
+ // }else{
|
|
|
+ // this.$set(this.form,'endTime',e.target.value);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
|
|
|
// 图片上传
|
|
|
selectImage(index) {
|
|
|
@@ -242,6 +304,8 @@
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
+ this.$set(this.form,'stcokId',this.form.id);
|
|
|
+ this.$set(this.form,'id','');
|
|
|
this.$set(this.form,'usageImg',this.imgList.join(','));
|
|
|
this.$set(this.form,'gasPressure',this.form.currentPressure);
|
|
|
|
|
|
@@ -255,7 +319,7 @@
|
|
|
});
|
|
|
setTimeout(function(){
|
|
|
uni.redirectTo({
|
|
|
- url: '/pages_manage/gasManage/gasManage'
|
|
|
+ url: '/pages/gasBottle/gasManage/gasManage'
|
|
|
});
|
|
|
},2000);
|
|
|
}
|
|
|
@@ -365,20 +429,20 @@
|
|
|
font-size: 30rpx;
|
|
|
font-family: PingFang SC-Medium, PingFang SC;
|
|
|
font-weight: 400;
|
|
|
- color: #333;
|
|
|
- line-height: 80rpx;
|
|
|
- width: 230rpx;
|
|
|
- text-align: center;
|
|
|
- }
|
|
|
- .picker-text2{
|
|
|
- font-size: 30rpx;
|
|
|
- font-family: PingFang SC-Medium, PingFang SC;
|
|
|
- font-weight: 400;
|
|
|
- color: #333;
|
|
|
+ color: #999;
|
|
|
line-height: 80rpx;
|
|
|
- width: 230rpx;
|
|
|
- text-align: center;
|
|
|
+ width: 516rpx;
|
|
|
+ text-align: right;
|
|
|
}
|
|
|
+ // .picker-text2{
|
|
|
+ // font-size: 30rpx;
|
|
|
+ // font-family: PingFang SC-Medium, PingFang SC;
|
|
|
+ // font-weight: 400;
|
|
|
+ // color: #333;
|
|
|
+ // line-height: 80rpx;
|
|
|
+ // width: 230rpx;
|
|
|
+ // text-align: center;
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
.register_li_min{
|
heyang
