From abc50c4470c7e3facb5dda96f4d801cd0d710cc7 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 27 Apr 2024 16:04:38 +0800
Subject: [PATCH] 更新
---
subPackage/school/clockIn.vue | 8 ++++++++
subPackage/school/securityDetail.vue | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/subPackage/school/clockIn.vue b/subPackage/school/clockIn.vue
index 16c077d..99fdf3a 100644
--- a/subPackage/school/clockIn.vue
+++ b/subPackage/school/clockIn.vue
@@ -13,6 +13,12 @@
<view class="content bgc-ff">
<u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="90"
:labelStyle="{fontSize:'28rpx'}">
+
+ <u-form-item label="场所名称" prop="placeName" borderBottom>
+ <u-input v-model="info.placeName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
+ inputAlign="right"></u-input>
+ </u-form-item>
+
<u-form-item label="角色类型" prop="type" borderBottom ref="phone" @click="showPicker = true"
v-if="roleName !='mj'">
<u-input v-model="clockInRoleTypeValue" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
@@ -97,6 +103,7 @@
data() {
return {
info: {
+ placeName: "",
type: "",
name: "",
phone: "",
@@ -262,6 +269,7 @@
if (isJur == 1) {
if (doorplateType == "中门牌" || doorplateType == "小门牌") {
this.info.houseCode = code;
+ this.info.placeName = res.data.poi;
}
} else {
uni.showModal({
diff --git a/subPackage/school/securityDetail.vue b/subPackage/school/securityDetail.vue
index 3a34183..685adae 100644
--- a/subPackage/school/securityDetail.vue
+++ b/subPackage/school/securityDetail.vue
@@ -142,6 +142,33 @@
</block>
</view>
+
+ <view class="image-wrap bgc-ff" v-if="roleType == 1 && info.status == 1 && info.rectificationFlag == 2">
+ <view class="mb-20">
+ 验收照片
+ </view>
+ <view class="flex flex-wrap">
+ <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
+ :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
+ :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
+ <view class="upload-item upload-icon flex_base">
+ <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
+ </view>
+ </u-upload>
+ </view>
+
+
+ </view>
+ <view class="image-wrap bgc-ff" v-if="info.status == 2 && imageUrls.length">
+ <view class="mb-20">
+ 验收照片
+ </view>
+ <view class="flex flex-wrap">
+ <view class="mr-20" v-for="i in imageUrls">
+ <u-image :src="i" width="140rpx" height="140rpx" @click="previewImage(imageUrls,i)"></u-image>
+ </view>
+ </view>
+ </view>
<view class="blank"></view>
<!-- <footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 4 || info.status == 3)"/> -->
<!-- <block v-if="info.rectificationFlag == 2">
@@ -177,6 +204,9 @@
},
data() {
return {
+ form: {
+ images: []
+ },
info: {},
images: [],
signatureUrl: [],
@@ -185,7 +215,8 @@
roleType: '', //1.民警/系统管理员 2.场所负责人 / 学校主体
ids: [],
taskId: "",
- type: 1 // 2学校主体
+ type: 1, // 2学校主体
+ imageUrls: []
}
},
async onLoad(option) {
@@ -227,6 +258,7 @@
let data = res.data;
// this.info = res.data;
this.images = this.$setImageUrl(res.data.rectificationNoticeImgUrl);
+ this.imageUrls = this.$setImageUrl(res.data.imageUrls);
// this.signatureUrl = this.$setImageUrl(res.data.signaturePath);
if (res.data.placePoiLabelVOList.length) {
this.label = res.data.placePoiLabelVOList[res.data.placePoiLabelVOList.length - 1]
@@ -350,13 +382,26 @@
uni.showLoading({
title: "加载中..."
})
- auditPlaceCheck({
+ let data = {
id: this.info.id,
taskId: this.info.taskId,
status: val.type,
rectificationFlag: val.type == 3 ? 1 : 2,
reasonFailure: val.remark
- }).then(res => {
+ }
+
+ if (this.form.images.length) {
+ let urls = []
+ this.form.images.forEach(e => {
+ urls.push(e.name)
+ })
+ data.imageUrls = urls.join(",")
+ } else {
+ this.$showTips("请上传验收照片")
+ return;
+ }
+
+ auditPlaceCheck(data).then(res => {
uni.hideLoading()
if (res.code == 200) {
this.$showTips("操作成功", "success");
--
Gitblit v1.9.3