| h5/pages/staff/meetingSubOrder.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/staff/snapshot.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/staff/task/vDangetAppr.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/staff/task/visitorApprove.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pda/pages/index/center.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pda/pages/index/queueup.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pda/utils/config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
h5/pages/staff/meetingSubOrder.vue
@@ -137,7 +137,8 @@ }) this.$eventBus.$on('meetingSub', (res) => { this.param = { ...res ...res, joinNotice: 1 } this.$set(this.param, 'activeDate', dayjs(res.yudingDate).format('YYYY年M月D日')) const bookingTimeList = res.bookingTimeList.split(',').map(i => { h5/pages/staff/snapshot.vue
@@ -18,7 +18,7 @@ <text>*</text> <text>隐患区域</text> </view> <view class="value" @click="isShowArea = true"> <view class="value" @click="openArea"> <text class="mr6" :style="{ color: param.areaName ? '#000000' : '#999999' }">{{ param.areaName ? param.areaName : "请选择" }}</text> <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon> @@ -236,6 +236,9 @@ this.$set(this.param, 'companyName', item.name) this.$set(this.param, 'areaId', '') this.$set(this.param, 'areaName', '') this.$set(this.param, 'checkUserId', '') this.$set(this.param, 'applyCheckUserId', '') this.$set(this.param, 'checkorName', '') DangerConfigType({ type: '0', companyId: item.id @@ -244,6 +247,10 @@ }) this.isShowCompany = false }, openArea() { if(!this.param.companyId) return this.showToast('请先选择责任部门') this.isShowArea = true }, seletedArea(e) { const item = e.value[0] this.$set(this.param, 'areaId', item.id) h5/pages/staff/task/vDangetAppr.vue
@@ -113,11 +113,12 @@ </view> </view> </view> <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" style="height: 90rpx;border: 1px solid red;"></view> <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" style="height: 90rpx;"></view> <view class="emyty"></view> <view class="main_footer" v-if="info.status == 0 && info.checkUserId == userInfo.memberId"> <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" class="btn" @click="handleBack">退回</view> <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" class="btn transfer" @click="handleTransfer"> <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" class="btn transfer" @click="handleTransfer"> 转交</view> <view v-if="info.status == 0 && info.checkUserId == userInfo.memberId" class="btn handle" @click="handleOpen">处理 </view> @@ -255,23 +256,21 @@ </u-popup> <!-- 转交 --> <u-popup :show="isShowTransfer" :round="10" safeAreaInsetBottom mode="bottom" @close="isShowTransfer = false"> <view class="appr_modal tran_modal"> <view class="appr_modal" :style="{height: (windowHeight - 120) + 'px'}"> <view class="title">选择员工</view> <view class="search_inp df_ac"> <image class="mr12 search" src="@/static/ic_search@2x.png" mode="widthFix"></image> <input v-model="transferModel.queryParam" @focus="showKeyboard = true" @blur="showKeyboard = false" @confirm="getMemList()" type="text" placeholder="搜索人员姓名" placeholder-style="color: #999999;" /> <input v-model="transferModel.queryParam" @focus="showKeyboard = true" @blur="showKeyboard = false" @confirm="getMemList()" type="text" placeholder="搜索人员姓名" placeholder-style="color: #999999;" /> </view> <view class="mt24 placeholder6">共{{ memberList.length }}条数据</view> <view class="member_list"> <view class="member_list" :style="{height: (windowHeight - 320) + 'px'}"> <view v-for="item in memberList" :key="item.id" class="line"> <image v-if="item.faceImg" :src="item.faceImg" class="avatar"></image> <span v-else class="img_name">{{ item.realname && item.realname.slice(0, 1) }}</span> <view class="content"> <view class="info"> <text class="name">{{ item.realname }}</text> <!-- <text class="tag">tag</text> --> </view> <view class="depart">{{ item.companyName }}</view> </view> @@ -282,8 +281,8 @@ </view> <view class="empty"></view> </view> <view v-if="!showKeyboard" class="Transfer_footer"> <view class="btn" @click="isShowTransfer = fales">取消</view> <view class="Transfer_footer"> <view class="btn" @click="isShowTransfer = false">取消</view> <view class="btn active" @click="enterTransfer">确认转交</view> </view> </view> @@ -384,10 +383,17 @@ onLoad(op) { const result = uni.getWindowInfo() this.windowHeight = result.windowHeight console.log('windowHeight', this.windowHeight); uni.setStorageSync('ywinfo', {}) this.id = op.id this.getDetail() // this.handleTransfer() }, mounted() { window.addEventListener('resize', () => { const currentHeight = window.innerHeight; this.windowHeight = currentHeight }); }, methods: { priviewImage(url) { @@ -513,7 +519,10 @@ getMemList() { userPagePost({ ...this.transferModel, querySpecial: 1, type: 2, companyType: 1,workStatus:0 querySpecial: 1, type: 2, companyType: 1, workStatus: 0 }).then(res => { this.memberList = res.data || [] @@ -837,6 +846,7 @@ background-color: #fff; padding-bottom: 0; position: relative; .flow_title { font-weight: 600; font-size: 32rpx; @@ -845,13 +855,16 @@ } .flow_wrap { padding: 30rpx 0 30rpx; padding: 30rpx; margin: 0 -30rpx; background-color: #fff; .list { .item { display: flex; margin-bottom: 48rpx; position: relative; .separate { position: absolute; width: 4rpx; @@ -1079,6 +1092,7 @@ display: flex; margin-bottom: 20rpx; flex-wrap: wrap; .img_wrap { margin-top: 24rpx; width: 156rpx; @@ -1295,9 +1309,6 @@ } } } .tran_modal{ height: 1260rpx; } .emyty { width: 750rpx; height: 20rpx; @@ -1336,9 +1347,7 @@ } .member_list { height: 900rpx; overflow: auto; // border: 1px solid; .line { display: flex; align-items: center; h5/pages/staff/task/visitorApprove.vue
@@ -250,7 +250,6 @@ .flow_wrap { padding: 30rpx 0; .flow_title { font-weight: 600; font-size: 32rpx; pda/pages/index/center.vue
@@ -42,6 +42,10 @@ <text class="value">{{ item.contractNum }}</text> <text class="primaryColor" @click="subDetail(item)">预约详情</text> </view> <view class="line line2" v-if="item.billCode && item.wmsContractNum"> <text class="label">合同单号</text> <text class="value">{{ item.wmsContractNum }}</text> </view> <view class="line"> <text class="label">驾驶员</text> <text class="value">{{ item.driverName }} {{ item.drivierPhone }}</text> @@ -83,6 +87,10 @@ <input v-model="platformCallSearch" type="text" placeholder="搜索车辆牌照" placeholder-class="placeholder9" @confirm="callQuery" /> </view> <view v-if="platformCallList.length == 0" class="empty_wrap"> <image src="@/static/default_nodata@2x.png" /> <text>暂无排队车辆</text> </view> <view class="order_list"> <scroll-view scroll-y="true" @scrolltolower="callScrolltolower" class="scroll_view"> <view class="platform_ing" v-for="item in platformCallList" :key="item.id"> @@ -106,6 +114,10 @@ <text class="label">合同单号</text> <text class="value">{{ item.contractNum }}</text> <text class="primaryColor" @click="subDetail(item)">预约详情</text> </view> <view class="line line2" v-if="item.billCode && item.wmsContractNum"> <text class="label">合同单号</text> <text class="value">{{ item.wmsContractNum }}</text> </view> <view class="line"> <text class="label">驾驶员</text> @@ -253,9 +265,6 @@ }, onLoad() { this.getPlatformGroup() // setInterval(() => { // this.getPlatformGroup() // }, 1000 * 30) }, onHide(){ if(this.timer1){ @@ -329,6 +338,9 @@ if (this.platformTaskInfo && this.platformTaskInfo.platformJobList && this.platformTaskInfo.platformJobList .length > 0) { this.platformTaskInfo.platformJobList.forEach(item => { if(item.wmsContractNum){ item.wmsContractNum = item.wmsContractNum.split(',').join('，') } if (item.newCallDate) { let timeNum = 0 if(time > new Date(item.newCallDate).getTime()){ @@ -498,6 +510,11 @@ }).then(res => { if (res.data && res.data.records) { this.platformCallList = [...this.platformCallList, ...res.data.records] this.platformCallList.forEach(item => { if(item.wmsContractNum){ item.wmsContractNum = item.wmsContractNum.split(',').join('，') } }) this.platformCallTotal = res.data.total } }) @@ -694,12 +711,15 @@ margin-bottom: 20rpx; .label { width: 144rpx; width: 132rpx; color: #666666; flex-shrink: 0; } .value { flex: 1; display: flex; flex-wrap: wrap; } } @@ -841,6 +861,7 @@ font-size: 28rpx; color: #666666; width: 88rpx; flex-shrink: 0; } .value { @@ -1083,4 +1104,8 @@ } } } .line2{ margin-right: -30rpx; padding-right: 0; } </style> pda/pages/index/queueup.vue
@@ -48,6 +48,10 @@ <text class="value">{{ item.contractNum }}</text> <text class="primaryColor" @click="subDetail(item)">预约详情</text> </view> <view class="line line2" v-if="item.billCode && item.wmsContractNum"> <text class="label">合同单号</text> <text class="value">{{ item.wmsContractNum }}</text> </view> <view class="line"> <text class="label">驾驶员</text> <text class="value" @@ -100,7 +104,7 @@ <view class="value">{{ wmsInfo.carrierName }}</view> </view> </view> <view class="separate"></view> <!-- <view class="separate"></view> --> <view class="contract_wrap"> <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList"> <view class="title">合同号：{{ item.contractCode }}</view> @@ -188,6 +192,11 @@ }).then(res => { if (res.data) { this.platformLineUpList = [...this.platformLineUpList, ...res.data.records || []] this.platformLineUpList.forEach(item => { if(item.wmsContractNum){ item.wmsContractNum = item.wmsContractNum.split(',').join('，') } }) this.total = res.data.total || 0 } }) @@ -298,6 +307,7 @@ margin-bottom: 20rpx; .label { width: 144rpx; flex-shrink: 0; color: #666666; } .value { @@ -451,4 +461,8 @@ } } } .line2{ margin-right: -30rpx; padding-right: 0; } </style> pda/utils/config.js
@@ -1,6 +1,7 @@ // export const baseUrl = 'gateway_interface/' export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/' // export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do` export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
