From 0f447633b246c0f3e9610439510716e4a87c021a Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 18 Jan 2024 17:32:58 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/cscj.vue | 20 +++++-----
subPackage/house/family/index.vue | 19 ++++++++-
subPackage/house/roomControl/index.vue | 64 +++++++++++++++----------------
3 files changed, 57 insertions(+), 46 deletions(-)
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index 68e9956..85ad4b1 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -67,15 +67,16 @@
<view class="flex" style="width:90%;">
<image class="box-icon" src="/static/icon/person.png" mode="aspectFill">
</image>
- <view class="label-wrap flex flex-wrap"
+ <scroll-view class="label-wrap flex flex-wrap"
v-if="scItem.householdLabelList.length">
<block v-for="i in scItem.householdLabelList">
- <view class="label-tag mr-10" v-if="i.labelName"
+ <view class="label-tag mr-10" @click.stop="showTag(i.labelName)"
+ v-if="i.labelName"
:style="{backgroundColor:$setLabelColor(i.color)}">
{{i.labelName}}
</view>
</block>
- </view>
+ </scroll-view>
</view>
<view class="r flex">
<!-- <view v-show="scItem.residentialStatus">
@@ -304,6 +305,12 @@
this.houseData = res.data;
})
},
+ showTag(labelName) {
+ uni.showToast({
+ title: labelName,
+ icon: "none"
+ })
+ }
}
}
</script>
@@ -507,14 +514,20 @@
.label-wrap {
margin-left: 5rpx;
width: calc(100% - 32rpx - 5rpx);
+ white-space: nowrap;
}
.label-tag {
+ width: 90rpx;
padding: 0 2rpx;
font-size: 20rpx;
color: #fff;
border-radius: 4rpx;
margin-bottom: 5rpx;
+ display: inline-block;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.store-icon {
diff --git a/subPackage/house/roomControl/index.vue b/subPackage/house/roomControl/index.vue
index c4bd761..7c28aee 100644
--- a/subPackage/house/roomControl/index.vue
+++ b/subPackage/house/roomControl/index.vue
@@ -4,30 +4,29 @@
<view class="content">
<u-form labelWidth="70" :model="form" ref="form" :rules="rules">
<view class="basic-info">
- <u-form-item class="form-item" labelWidth="100" label="绑定手机" required borderBottom prop="phone">
+ <!-- <u-form-item class="form-item" labelWidth="100" label="绑定手机" borderBottom prop="phone">
<u--input border="none" v-model="form.phone" :disabled="roleType == 2?true:false"
:placeholder="setPlaceholder(1)">
</u--input>
- </u-form-item>
+ </u-form-item> -->
<u-form-item class="form-item" labelWidth="100" label="地址" borderBottom>
<u--input border="none" :placeholder="setPlaceholder(1)" v-model="form.address"
- :disabled="roleType == 2?true:false">
+ :disabled="true" disabled-color="#fff">
</u--input>
</u-form-item>
<u-form-item class="form-item" labelWidth="100" label="物业月费" borderBottom>
<u--input border="none" :placeholder="setPlaceholder(1)" v-model="form.propertyPrice"
- :disabled="roleType == 2?true:false">
+ :disabled="true" disabled-color="#fff">
</u--input>
</u-form-item>
- <u-form-item class="form-item" labelWidth="100" label="到期时间" borderBottom
- @click="showSelectDate = true">
+ <u-form-item class="form-item" labelWidth="100" label="到期时间" borderBottom>
<u--input border="none" :placeholder="setPlaceholder(2)" v-model="form.serviceDue" disabled
disabledColor="#ffffff">
</u--input>
- <u-icon slot="right" name="arrow-right" v-show="roleType != 2"></u-icon>
+ <!-- <u-icon slot="right" name="arrow-right" v-show="roleType != 2"></u-icon> -->
</u-form-item>
</view>
@@ -43,8 +42,8 @@
<newBoxTitle title="房屋标签"></newBoxTitle>
<view class="list">
<view v-for="(item, index) in labelBtnList" :key="index">
- <u-button size="mini" type="primary" :color="item.color"
- :style="{color: item.color && '#fff'}" :text="item.name"
+ <u-button size="mini" type="primary" :color="$setLabelColor(item.color)"
+ :style="{color: $setLabelColor(item.color) && '#fff'}" :text="item.name"
@click="showLabelPopup(item)"></u-button>
</view>
</view>
@@ -121,30 +120,29 @@
serviceDue: "",
imageUrls: "",
},
- rules: {
-
- phone: [{
- required: true,
- message: '请输入手机号',
- // 可以单个或者同时写两个触发验证方式
- trigger: ['change', 'blur'],
- },
- {
- // 自定义验证函数，见上说明
- validator: (rule, value, callback) => {
- const reg =
- /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[1589]))\d{8}$/
- if (reg.test(value)) {
- return true
- }
- return false
- },
- message: '请输入正确的手机号',
- // 触发器可以同时用blur和change
- trigger: ['change', 'blur'],
- }
- ]
- },
+ // rules: {
+ // phone: [{
+ // required: true,
+ // message: '请输入手机号',
+ // // 可以单个或者同时写两个触发验证方式
+ // trigger: ['change', 'blur'],
+ // },
+ // {
+ // // 自定义验证函数，见上说明
+ // validator: (rule, value, callback) => {
+ // const reg =
+ // /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[1589]))\d{8}$/
+ // if (reg.test(value)) {
+ // return true
+ // }
+ // return false
+ // },
+ // message: '请输入正确的手机号',
+ // // 触发器可以同时用blur和change
+ // trigger: ['change', 'blur'],
+ // }
+ // ]
+ // },
showList: {
relation: false
},
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index b5f2ce8..77e2d6d 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -315,16 +315,16 @@
// name: 'username',
// value: "未完善",
// },
- {
- label: "采集人",
- name: 'createUserName',
- value: "未完善"
- },
- {
- label: "采集时间",
- name: 'createTime',
- value: "未完善"
- },
+ // {
+ // label: "采集人",
+ // name: 'createUserName',
+ // value: "未完善"
+ // },
+ // {
+ // label: "采集时间",
+ // name: 'createTime',
+ // value: "未完善"
+ // },
// {
// label: "历史事件",
// value: "未完善",
--
Gitblit v1.9.3