diff --git a/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue b/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
index c4d19fb..5c3542e 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
@@ -125,7 +125,7 @@ function getlist() {
return
}
isLoading.value = true
- getSystemUsers_employee('complainUser', queryParmas.value.keyword)
+ getSystemUsers_employee('', queryParmas.value.keyword)
.then(res => {
searchlist.value = res.data
})
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
index 109134f..8ae829e 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
@@ -276,6 +276,8 @@ function handlePrivew(lists, index) {
font-size: 28rpx;
color: #666666;
line-height: 36rpx;
+ word-wrap: break-word; // 单词/中文自动换行
+ word-break: break-all; // 长英文无空格强制截断换行
}
}
}
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue
index 49881d0..4f08a4c 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue
@@ -385,14 +385,20 @@ function handlePrivew(items, index) {
margin-bottom: 20rpx;
}
.card-title {
- margin-right: 20rpx;
+ flex: 1;
+ margin-right: 10rpx;
font-size: 32rpx;
color: #222222;
line-height: 40rpx;
+ white-space: pre-wrap;
+ /* 允许在数字内部断开，消除“整串数字,字母集体跳下一行” */
+ word-break: break-all;
+ overflow-wrap: break-word;
}
/* 状态标签 */
.status-tag {
+ min-width: 82rpx;
width: 82rpx;
height: 30rpx;
border-radius: 15rpx;
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
index ec180e7..766d51f 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
@@ -30,7 +30,7 @@
保修信息
-
+
报修房屋
{{ repairInfo.houseName }}
@@ -428,7 +428,7 @@ function handlePrivew(items, index = 0) {
font-size: 28rpx;
color: #666666;
line-height: 36rpx;
- word-wrap: break-word;
+ word-break: break-all;
overflow-wrap: break-word;
}
}
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue b/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue
index c0b78e1..61812f5 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue
@@ -58,7 +58,13 @@
-
+
确定派单
@@ -141,10 +147,12 @@ function resetList() {
getlist()
}
//searchlist----------------------
+const disabled = ref(true)
const checkoutUserid = ref(null)
const checkoutInfo = ref(null)
function radioChange(val) {
checkoutUserid.value = val.detail.value
+ disabled.value = false
const find = searchlist.value.find(item => item.userId === val.detail.value)
if (find) {
checkoutInfo.value = find
@@ -159,15 +167,24 @@ onMounted(() => {
eventChannel = instance.getOpenerEventChannel()
}
})
+
/* 确定派单 */
function handleSelecthouse() {
- // api
- if (eventChannel) {
- eventChannel.emit('backData', {
- checkoutUserid: checkoutUserid.value
+ if (checkoutUserid.value) {
+ // api
+ if (eventChannel) {
+ eventChannel.emit('backData', {
+ checkoutUserid: checkoutUserid.value
+ })
+ // 3. 返回上一页
+ uni.navigateBack()
+ }
+ } else {
+ uni.showToast({
+ mask: true,
+ icon: 'error',
+ title: '请选择派单人员'
})
- // 3. 返回上一页
- uni.navigateBack()
}
}
// ===========================================
@@ -247,6 +264,10 @@ function handleSelecthouse() {
margin-top: 20rpx;
background: #4d5dfa;
border-radius: 8rpx 8rpx 8rpx 8rpx;
+ &.disabled {
+ background-color: #f3f3f3;
+ color: #333333;
+ }
}
}
}
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 22105a7..0047792 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -1,129 +1,129 @@
-
-
+
+
-
-
-
@@ -288,7 +288,7 @@ const functionList = [
action: 'goToRevenueStatistics'
},
{
- permKey: 'butler:feeOverview:view',
+ permKey: 'butler:feeOverview:stats',
icon: 'https://wuye.ckdzkj.com/images/imgs/fee-overview.png',
text: '收费总览',
action: 'goToFeeOverview'
@@ -351,8 +351,12 @@ const getInspectionData = () => {
}
// 获取消息通知
const getNoticeData = () => {
- getNewNoticeData().then(res => {
- const notice = res.code === 200 && res.data ? `${res.data.notice || ''} : ${res.data.item || ''}` : '暂无公告'
+ getNewNoticeData()
+ .then(res => {
+ const notice =
+ res.code === 200 && res.data
+ ? `${res.data.notice || ''} : ${res.data.item || ''}`
+ : '暂无公告'
// 仅在内容真正变化时才更新
if (noticeText.value !== notice) {
noticeText.value = notice
diff --git a/wuye-manager-uniapp/pages/my/my.vue b/wuye-manager-uniapp/pages/my/my.vue
index e661c53..2068b4c 100644
--- a/wuye-manager-uniapp/pages/my/my.vue
+++ b/wuye-manager-uniapp/pages/my/my.vue
@@ -25,7 +25,7 @@
@@ -40,7 +40,6 @@ import { getSettingInfo } from '../../api/api.js'
const list = ref([
{ icon: 'https://wuyeadmin.bugtc.com/images/imgs/shangbao.png', title: '上报记录' },
{ icon: 'https://wuyeadmin.bugtc.com/images/imgs/xunjian.png', title: '巡检记录' },
- { icon: 'https://wuye.ckdzkj.com/images/home/updateDevice.png', title: '仪表换新' },
{ icon: 'https://wuyeadmin.bugtc.com/images/propertyImgs/setting.png', title: '设置' }
])
@@ -179,15 +178,15 @@ const onItemClick = item => {
margin-right: 10rpx;
flex-shrink: 0;
}
- .icp-footer {
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 20rpx 0;
- }
+.icp-footer {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 20rpx 0;
+}
- .icp-text {
- font-size: 22rpx;
- color: #999999;
- }
+.icp-text {
+ font-size: 22rpx;
+ color: #999999;
+}