From 0f272e2cd2ce4363453213dc9861cc8a5614d9db Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 12 十一月 2024 15:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingCalendar.vue | 3 ++-
h5/utils/config.js | 1 +
h5/pages/staff/vehicle/sendACar.vue | 7 ++++---
h5/pages/staff/vehicle/sendACarDetail.vue | 27 +++++++++++++++++++--------
admin/src/views/operation/serviceCar/apprConfig.vue | 2 +-
screen/src/views/FireFighting.vue | 4 ++--
6 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index e0bb8c7..e42cad6 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -153,7 +153,7 @@
type="primary">淇濆瓨閰嶇疆椤�</el-button>
<el-button v-if="activeIndex !== 0 && activeIndex !== apprList.length - 1" type="danger" plain
@click="handleDel">鍒犻櫎鑺傜偣</el-button>
- </div>
+ </div>3
</div>
</div>
</template>
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 64a22be..cf2c33b 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -228,7 +228,8 @@
this.getRoomList()
},
onShow() {
- this.tabClick('0')
+ // this.tabClick('0')
+ this.getRecordList()
},
onReachBottom() {
const { activeTab } = this
diff --git a/h5/pages/staff/vehicle/sendACar.vue b/h5/pages/staff/vehicle/sendACar.vue
index bcf1fcc..177ca60 100644
--- a/h5/pages/staff/vehicle/sendACar.vue
+++ b/h5/pages/staff/vehicle/sendACar.vue
@@ -7,8 +7,7 @@
<u-icon class="ml12" name="arrow-down" color="#999999" />
</view>
<view class="item" @click="isShowCar = true">
- <text v-if="param.carCode">{{ param.carCode }}</text>
- <text v-else class="placeholder9">閫夋嫨杞﹁締</text>
+ <text>{{ param.carCode || '鍏ㄩ儴杞﹁締' }}</text>
<u-icon class="ml12" name="arrow-down" color="#999999" />
</view>
</view>
@@ -140,6 +139,7 @@
seletedCar(e) {
const item = e.value[0]
this.pagination.page = 0
+ this.dataList = []
this.$set(this.param, 'carCode', item.code)
this.$set(this.param, 'carId', item.id)
this.isShowCar = false
@@ -150,6 +150,7 @@
this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
this.pagination.page = 0
this.isShowDate = false
+ this.dataList = []
this.getList()
})
},
@@ -168,7 +169,7 @@
getCarsList({
type: 0
}).then(res => {
- this.carsList = [res.data]
+ this.carsList = [[{ code: '鍏ㄩ儴杞﹁締', id: '' }, ...res.data]]
})
},
}
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index f45166d..07bed90 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -99,18 +99,23 @@
info.approveDateVO.canBeApproved != null &&
info.approveDateVO.canBeApproved == 1
">
- <template v-if="appr == '1'">
+ <template>
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</template>
- <view v-else class="btn agree" @click="isShowBack = true">鎾ら攢鐢ㄨ溅</view>
- </view>
+ </view>
+ <template v-else>
+ <view v-if="(info.approveDateVO.canBeApproved == 1 || userInfo.memberId == info.memberId) && info.status == 0" class="main_footer" @click="isShowBack = true">
+ <view class="agree btn">鎾ゅ洖鐢ㄨ溅</view>
+ </view>
+ </template>
+
<!-- 鎾ら攢 -->
<u-popup :show="isShowBack" :round="10" :safeAreaInsetBottom="true" mode="bottom" @close="isShowBack = false">
<view class="appr_modal">
- <view class="title">鎾ら攢鐢ㄨ溅</view>
- <view class="line"> 鎾ら攢璇存槑 </view>
+ <view class="title">鎾ゅ洖鐢ㄨ溅</view>
+ <view class="line"> 鎾ゅ洖璇存槑 </view>
<textarea v-model="backParam.info" placeholder="闈炲繀濉�" placeholder-class="placeholder9" />
<view class="main_footer">
<view class="btn agree" @click="onSubBack">鎻愪氦</view>
@@ -154,7 +159,8 @@
showApprModal: false,
isShowBack: false,
backParam: {},
- isShowDrive: false,
+ isShowDrive: false,
+ userInfo: uni.getStorageSync('userInfo') || {},
id: '',
appr: '',
infoStatus: '',
@@ -262,8 +268,13 @@
this.showApprModal = true
},
getDriveList() {
- driveListPost({}).then(res => {
- this.driveList = [res.data]
+ driveListPost({}).then(res => {
+ const temp = res.data || []
+ this.driveList = [res.data]
+ if(this.param.driverId){
+ const item = temp.find(i=>i.id == this.param.driverId)
+ this.$set(this.param, 'driverName', item.name)
+ }
})
},
seletedDrive(e) {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index e4c0895..d6d6ee5 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,6 +1,7 @@
export const baseUrl = 'gateway_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
+// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index c403ab2..b9b4b1f 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -1347,7 +1347,7 @@
margin-right: 7px;
}
}
-
+
.static_wrap {
display: flex;
justify-content: space-evenly;
@@ -1401,7 +1401,7 @@
overflow: auto;
margin-top: 15px;
scrollbar-width: none;
-
+
.item {
display: flex;
font-size: 13px;
--
Gitblit v1.9.3