diff --git a/src/components/AiPagePicker/AiPagePicker.vue b/src/components/AiPagePicker/AiPagePicker.vue
index 9a2dc3b..c17af3d 100644
--- a/src/components/AiPagePicker/AiPagePicker.vue
+++ b/src/components/AiPagePicker/AiPagePicker.vue
@@ -32,6 +32,7 @@ export default {
return {
configList: {
resident: {url: "/components/pages/selectResident", label: "name"},
+ residentMultiple: {url: "/components/pages/selectResidentMultiple", label: "name"},
sysUser: {url: "/components/pages/selectSysUser", label: "name"},
gird: {url: "/components/pages/selectGird", label: "girdName"},
party: {url: "/components/pages/selectParty", label: "name"},
diff --git a/src/components/pages/selectResidentMultiple.vue b/src/components/pages/selectResidentMultiple.vue
new file mode 100644
index 0000000..97b3367
--- /dev/null
+++ b/src/components/pages/selectResidentMultiple.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
![]()
+

{{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/pages/selectSysUser.vue b/src/components/pages/selectSysUser.vue
index 73029b9..e6433f2 100644
--- a/src/components/pages/selectSysUser.vue
+++ b/src/components/pages/selectSysUser.vue
@@ -57,12 +57,11 @@ export default {
...mapState(['user']),
},
onLoad(query) {
- console.log(query)
this.query = query
if (query.selected) {
this.selected = query.selected?.split(",") || []
}
- this.isSingle = query.single || false
+ this.isSingle = query.single == 'false' ? false : true
this.nodeKey = query.nodeKey || "idNumber"
this.isRequire = query.isRequire || 1
this.isShowPhone = query.isShowPhone || false
diff --git a/src/project/weiyang/AppBuilding/add.vue b/src/project/weiyang/AppBuilding/add.vue
index 830436e..1ed5736 100644
--- a/src/project/weiyang/AppBuilding/add.vue
+++ b/src/project/weiyang/AppBuilding/add.vue
@@ -46,7 +46,7 @@
起租日期
- {{ $dateFormat(houseInfo.startDate,'YYYY-MM-DD') || '请选择' }}
+ {{ houseInfo.startDate.substring(0, 12) || '请选择' }}
@@ -64,7 +64,7 @@
@@ -81,7 +81,7 @@
@@ -98,7 +98,7 @@
@@ -171,7 +171,7 @@ export default {
},
getDetail() {
// let {id} = this.$route.query
- id && this.$instance.post(`/app/appcommunityhouseinfo/queryDetailById?id=${this.id}`).then(res => {
+ this.$instance.post(`/app/appcommunityhouseinfo/queryDetailById?id=${this.id}`).then(res => {
if (res?.data) {
this.houseInfo = res.data
}
@@ -197,6 +197,15 @@ export default {
},
dateConfirm(e) {
this.houseInfo.startDate = `${e.year}-${e.month}-${e.day} 00:00:00`
+ },
+ handleOwner(e) {
+ this.houseInfo.owner = e
+ },
+ handleRenter(e) {
+ this.houseInfo.renter = e
+ },
+ handleLive(e) {
+ this.houseInfo.live = e
}
}
}
diff --git a/src/project/weiyang/AppBuilding/detail.vue b/src/project/weiyang/AppBuilding/detail.vue
index 2e4d293..407002a 100644
--- a/src/project/weiyang/AppBuilding/detail.vue
+++ b/src/project/weiyang/AppBuilding/detail.vue
@@ -71,7 +71,7 @@
-
{{ $dateFormat(houseInfo.startDate, 'YYYY-MM-DD') }}
+
{{ houseInfo.startDate.substring(0, 10) }}
起租日期
diff --git a/src/project/weiyang/AppWorkTask/AppWorkTask.vue b/src/project/weiyang/AppWorkTask/AppWorkTask.vue
index b9c3faa..7657ab5 100644
--- a/src/project/weiyang/AppWorkTask/AppWorkTask.vue
+++ b/src/project/weiyang/AppWorkTask/AppWorkTask.vue
@@ -3,7 +3,7 @@
-
-
+
+
@@ -119,7 +120,7 @@
url: "./detail?id=" + item.id + "&taskCode=" + item.taskCode + "&isMine=" + this.index
})
},
- add() {
+ toAdd() {
uni.navigateTo({
url: "./create"
})
@@ -295,5 +296,38 @@
}
}
}
+
+ .ai-add {
+ width: 96px;
+ height: 96px;
+ background: #1365DD;
+ box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ justify-content: center;
+ position: fixed;
+ bottom: 240px;
+ right: 32px;
+
+ &:before, &:after {
+ content: "";
+ background: #FFFFFF;
+ display: block;
+ position: absolute;
+ border-radius: 4px;
+ }
+
+ &:before {
+ height: 48px;
+ width: 4px;
+ }
+
+ &:after {
+ height: 4px;
+ width: 48px;
+ }
+ }
}
diff --git a/src/project/weiyang/AppWorkTask/create.vue b/src/project/weiyang/AppWorkTask/create.vue
index 76294ed..6bc084e 100644
--- a/src/project/weiyang/AppWorkTask/create.vue
+++ b/src/project/weiyang/AppWorkTask/create.vue
@@ -8,7 +8,7 @@
-
+
-
+
*任务标题
@@ -30,7 +30,7 @@
-
+
*任务说明
@@ -54,51 +54,53 @@
-
-
-
*执行人
+
+
+
+ *执行人
+
+
+
+
+ 已选择{{form.userInfoList.slice(0,2).map(e=>e.name).join("、")}}等
+ {{form.userInfoList.length}}人
+
+ 请选择
+
+
+
-
-
-
- 已选择{{form.userInfoList.slice(0,2).map(e=>e.name).join("、")}}等
- {{form.userInfoList.length}}人
-
- 请选择
-
-
+
+
督办人
+
+
+
+ 已选择{{form.checkUserList.slice(0,2).map(e=>e.name).join("、")}}等
+ {{form.checkUserList.length}}人
+
+ 请选择
+
+
+
+
+
+
抄送人
+
+
+
+ 已选择{{form.sendUserList.slice(0,2).map(e=>e.name).join("、")}}等
+ {{form.sendUserList.length}}人
+
+ 请选择
+
+
+
-
-
督办人
-
-
-
- 已选择{{form.checkUserList.slice(0,2).map(e=>e.name).join("、")}}等
- {{form.checkUserList.length}}人
-
- 请选择
-
-
-
-
-
-
抄送人
-
-
-
- 已选择{{form.sendUserList.slice(0,2).map(e=>e.name).join("、")}}等
- {{form.sendUserList.length}}人
-
- 请选择
-
-
-
-
-
+
发送任务通知
form.isNofity=Number(e.detail.value)"/>
@@ -249,7 +251,6 @@
box-sizing: border-box;
margin: 0 0 16px 32px;
width: calc(100% - 64px);
- border-radius: 16px;
.left {
font-size: 32px;
@@ -331,6 +332,18 @@
}
}
+ .border-r {
+ border-radius: 16px;
+ .top {
+ border-top-left-radius: 16px;
+ border-top-right-radius: 16px;
+ }
+ .bottom {
+ border-bottom-left-radius: 16px;
+ border-bottom-right-radius: 16px;
+ }
+ }
+
.flex {
display: flex;
.left {
diff --git a/src/project/weiyang/AppWorkTask/detail.vue b/src/project/weiyang/AppWorkTask/detail.vue
index 7f73976..009baf1 100644
--- a/src/project/weiyang/AppWorkTask/detail.vue
+++ b/src/project/weiyang/AppWorkTask/detail.vue
@@ -1,6 +1,7 @@
-
+
-
+
完成到{{item.percent}}%
@@ -168,7 +169,6 @@
}
},
methods: {
- ...mapActions(['previewFile', 'injectJWeixin']),
preFile(e) {
if([".jpg",".png",".gif"].includes(e.postfix.toLowerCase())){
uni.previewImage({
@@ -179,6 +179,24 @@
this.previewFile({ ...e})
}
},
+ previewFile(e) {
+ if(e.postfix && ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'].includes(e.postfix.split('.')[1])) {
+ uni.downloadFile({
+ url: e.accessUrl,
+ success: function (res) {
+ var filePath = res.tempFilePath;
+ uni.openDocument({
+ filePath: filePath,
+ fileType: e.postfix.split('.')[1],
+ showMenu: true,
+ });
+ }
+ });
+ }else {
+ this.$u.toast("该文件类型不支持预览!")
+ }
+
+ },
getDetail() {
this.$instance.post("/app/appworktaskinfo/queryDetailById", null, {
params: {
@@ -404,7 +422,8 @@
padding: 0 16px;
margin-bottom: 32px;
- & > .u-row {
+ .file-flex {
+ display: flex;
height: 100%;
.left {
@@ -428,12 +447,14 @@
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
+ word-break: break-all;
}
}
& > span {
font-size: 28px;
color: #999999;
+ margin: auto 0;
}
}
}
@@ -532,5 +553,9 @@
text-align: center;
}
}
+
+ ::v-deep .u-collapse:after {
+ height: 0!important;
+ }
}
diff --git a/src/project/weiyang/AppWorkTask/finish.vue b/src/project/weiyang/AppWorkTask/finish.vue
index d5e5c2d..089c575 100644
--- a/src/project/weiyang/AppWorkTask/finish.vue
+++ b/src/project/weiyang/AppWorkTask/finish.vue
@@ -12,7 +12,7 @@
diff --git a/src/project/weiyang/AppWorkTask/finishDetail.vue b/src/project/weiyang/AppWorkTask/finishDetail.vue
index 296a736..b99756f 100644
--- a/src/project/weiyang/AppWorkTask/finishDetail.vue
+++ b/src/project/weiyang/AppWorkTask/finishDetail.vue
@@ -24,7 +24,7 @@
完成时间:
- {{detail.finishTime}}
+ {{detail.finishTime || ''}}
@@ -85,6 +85,7 @@
}).then(res => {
if (res && res.data) {
this.detail = res.data;
+ this.detail.name = this.detail.name ? this.detail.name : this.detail.userName
}
})
}