zhouyanli/property-manager-side
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

Browse Source
This commit is contained in:
zhouyanli
2026-06-09 14:21:03 +08:00
parent 94d03a270f 43d7d1b911
commit d41b31d6b9
9 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
View File

@@ -2,12 +2,12 @@
<view class="page_padding">
<view class="flex-1 flex-col flex inspection_main_box">
<view class="info_box">
<view class="title_box flex items-center justify-between">
<view class="title flex items-center">
<view class="line"> </view>
<view class="title_box flex flex-between">
<view class="title flex">
<text class="line"></text>
<text>{{ info.villageName }} - {{ info.taskName }}</text>
</view>
<view class="inspection_status"> <text>已巡检</text> </view>
<view class="inspection_status" style="flex: 100rpx"> <text>已巡检</text> </view>
</view>
<view class="info">
<view class="item">
@@ -180,7 +180,6 @@ onLoad(options => {
font-size: 32rpx;
color: #333333;
min-height: 40rpx;
text-wrap: wrap;
line-height: 40rpx;
.line {
display: block;
@@ -190,12 +189,11 @@ onLoad(options => {
}
}
.inspection_status {
width: 100rpx;
font-weight: 400;
font-size: 28rpx;
color: #666666;
line-height: 36rpx;
text-align: center;
&.todo {
color: #4d5dfa;
}

5
wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
View File

@@ -155,6 +155,11 @@ function handleChangeTime(event: string) {
}
function handleTap(ite) {
const today = parseTime(new Date(), '{m}月{d}日')
if (today !== showDate.value) {
return
}
if (isComputed(ite.taskStatus)) {
uni.navigateTo({
url: '/pageSubPack/inspection/inspection_main?id=' + ite.id

4
wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue
View File

@@ -44,7 +44,7 @@
<view class="info_body" v-for="(ite, ind) in item.points" :key="ind">
<view class="info_title" style="margin-bottom: 20rpx"> {{ ite.ponitName }} </view>
<uni-forms :modelValue="ite" :rules="rules" label-position="left" label-width="150">
<uni-forms-item label="巡检状态" required>
<uni-forms-item label="巡检状态" :required="!ite.complated">
<uni-data-checkbox
:disabled="ite.complated"
v-model="ite.status"
@@ -68,7 +68,7 @@
</view>
<view class="items_picker_box">
<view class="label">
<text class="is-required">*</text>
<text class="is-required" v-if="!ite.complated">*</text>
<text>巡检照片</text>
</view>
<view class="filePickerbox" v-if="!ite.complated">

1
wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
View File

@@ -153,7 +153,6 @@ function init() {
onLoad(options => {
activeValue.value = Number(options.type)
console.log(activeValue.value)
})
onShow(() => {

9
wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
View File

@@ -26,6 +26,7 @@
<uni-forms-item label="房屋号">
<view @tap="handleClick" style="width: 100%">
<uni-easyinput
class="easy-ellipsis-1"
:inputBorder="false"
disabled
v-model="houseName"
@@ -84,6 +85,7 @@ function handleClick() {
/** 处理 扫码 */
function handleScan() {
uni.scanCode({
scanType: ['barCode', 'qrCode', 'datamatrix', 'pdf417'],
success: function (res) {
formData.value.deviceCode = res.result
},
@@ -133,7 +135,7 @@ function handleSubmit() {
<style lang="scss" scoped>
.addreplacement_box {
background: #ffffff;
padding-top: 0;
&:deep(.uni-forms-item) {
display: flex;
align-items: center;
@@ -166,4 +168,9 @@ function handleSubmit() {
margin-left: 20rpx;
}
}
.easy-ellipsis-1:deep(.uni-easyinput__content-input) {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>

16
wuye-manager-uniapp/pageSubPack/instrument/checkouthouse.vue
View File

@@ -35,13 +35,10 @@
active: checkoutHouseid === item.houseId
}"
>
<view class="flex items-center flex-1">
<!-- checkout -->
<view class="housepath flex items-center flex-1">
<radio color="#4d5dfa" :value="item.houseId" />
<!-- housename -->
<text class="address">{{ item.addressCn ?? item.addressHyphen }}</text>
</view>
<!-- username -->
<view class="username">{{ item.residentName }}</view>
</view>
</label>
@@ -221,12 +218,22 @@ function handleSelecthouse() {
&:deep(radio) {
transform: scale(0.68);
}
.housepath {
overflow: hidden;
}
.address {
margin-left: 20rpx;
font-weight: 550;
font-size: 32rpx;
color: #222222;
line-height: 40rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2; /* 控制行数，2行就写2 */
-webkit-box-orient: vertical;
word-break: break-all; /* 自动换行 */
}
.username {
@@ -236,6 +243,7 @@ function handleSelecthouse() {
line-height: 40rpx;
width: 180rpx;
text-align: left;
margin-left: 10rpx;
}
&.active {
background: #f5faff;

5
wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
View File

@@ -364,6 +364,8 @@ function handleRepairCompluted() {
margin-bottom: 30rpx;
.label {
margin-bottom: 32rpx;
white-space: nowrap;
margin-right: 20px;
}
.value {
height: 162rpx;
@@ -401,6 +403,8 @@ function handleRepairCompluted() {
color: #222222;
line-height: 36rpx;
width: 35%;
white-space: nowrap;
margin-right: 20px;
}
.value {
flex: 1;
@@ -409,6 +413,7 @@ function handleRepairCompluted() {
color: #666666;
line-height: 36rpx;
text-wrap: wrap;
overflow: hidden;
}
}
}