From e21fa393941e5f734822debc1f3f992c3e75d864 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 25 Apr 2024 13:33:16 +0800
Subject: [PATCH] 更新
---
subPackage/school/securityDetail.vue | 99 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/subPackage/school/securityDetail.vue b/subPackage/school/securityDetail.vue
index f11fce2..36f1029 100644
--- a/subPackage/school/securityDetail.vue
+++ b/subPackage/school/securityDetail.vue
@@ -50,10 +50,16 @@
</view>
<view class="item-row flex j-c-s-b a-i-c">
<text>状态</text>
- <text v-if="info.status == 1">待审核</text>
- <text v-if="info.status == 2">审核成功</text>
- <text v-if="info.status == 3">审核驳回</text>
- <text v-if="info.status == 4">待完成</text>
+ <block v-if="info.rectificationFlag == 2">
+ <text v-if="info.status == 1">待审核</text>
+ <text v-if="info.status == 2">审核成功</text>
+ <text v-if="info.status == 3">审核驳回</text>
+ <text v-if="info.status == 4">待完成</text>
+ </block>
+ <block v-if="info.rectificationFlag == 1">
+ <text>未整改完成</text>
+ </block>
+
</view>
<view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
<text>驳回原因</text>
@@ -71,30 +77,19 @@
</view>
</view>
- <view class="image-wrap bgc-ff" v-if="signatureUrl.length">
- <view class="mb-20">
- 签名
- </view>
- <view class="image-item" v-for="(i,k) in signatureUrl" @click="previewImage(signatureUrl,i)">
- <u-image :src="i" width="100rpx" height="100rpx"></u-image>
- </view>
- </view>
-
-
-
<view class="mt-20 bgc-ff">
<block v-for="(item,index) in itemList">
<block v-for="(i,k) in item.children">
<block v-for="(n,m) in info.taskPlaceRecordVOList">
- <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 0">
+ <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 1">
<text class="item-left fw">{{item.title}}</text>
<!-- <text>不存在</text> -->
</view>
- <u-collapse :value="ids" v-if="i.id == n.itemId && n.state == 0" ref="collapse">
- <u-collapse-item :name="n.itemId" :title="i.title" value="存在" :disabled="true"
+ <u-collapse :value="ids" v-if="i.id == n.itemId && n.state == 1" ref="collapse">
+ <u-collapse-item :name="n.itemId" :title="i.title" value="否" :disabled="true"
:clickable="false" :isLink="false">
<view class="mb-20" v-if="n.imageUrls">
- <view class="f-26 mb-10 c-00">隐患照片</view>
+ <view class="f-26 mb-10 c-00">整改照片</view>
<view class="flex flex-wrap">
<view class="mr-20" v-for="r in ($setImageUrl(n.imageUrls))">
<u-image :src="r" width="140rpx" height="140rpx"
@@ -138,9 +133,6 @@
placeholderClass="c-99 f-26"
:disabled="roleType == 2 && (info.status == 4 || info.status == 3)?false:true"></u-textarea>
</view> -->
-
-
-
</u-collapse-item>
</u-collapse>
</block>
@@ -149,9 +141,13 @@
</view>
<view class="blank"></view>
- <!-- <footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 4 || info.status == 3)" /> -->
- <audit-action v-if="roleType == 1 && info.status == 1" @handle="submitAudit" />
- <footer-btn v-if="roleType == 2 && info.status == 3" text="重新提交" @click="navTo" />
+ <!-- <footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 4 || info.status == 3)"/> -->
+ <block v-if="info.rectificationFlag == 2">
+ <audit-action v-if="roleType == 1 && info.status == 1" @handle="submitAudit" />
+ </block>
+ <block v-if="info.rectificationFlag == 1">
+ <footer-btn v-if="roleType == 2 &&( info.status == 3 || info.status == 1)" text="重新提交" @click="navTo" />
+ </block>
</view>
</template>
@@ -169,7 +165,7 @@
auditPlaceCheck
} from '@/api/reporting/reporting.js'
- import auditAction from '../components/actionBtn.vue'
+ import auditAction from '@/components/btn/actionBtn.vue'
export default {
mixins: [uploadMixin],
components: {
@@ -182,20 +178,28 @@
signatureUrl: [],
label: "",
itemList: [],
- roleType: '', //1.民警/系统管理员 2.场所负责人
+ roleType: '', //1.民警/系统管理员 2.场所负责人 / 学校主体
ids: [],
- taskId: ""
+ taskId: "",
+ type: 1 // 2学校主体
}
},
async onLoad(option) {
let {
- roleName
+ roleName,
+ roleAlias
} = uni.getStorageSync("activeRole")
if (roleName == "居民") {
this.roleType = 2;
- }
- if (roleName == "民警" || roleName == "系统管理员") {
+ } else if (roleName == "民警" || roleName == "系统管理员") {
this.roleType = 1;
+ } else if (roleAlias == "xyzt") {
+ this.roleType = 2;
+ }
+
+
+ if (option.type) {
+ this.type = option.type;
}
await this.getItem();
@@ -217,21 +221,21 @@
}).then(res => {
let data = res.data;
// this.info = res.data;
- this.images = this.$setImageUrl(res.data.imageUrls);
- this.signatureUrl = this.$setImageUrl(res.data.signaturePath);
+ this.images = this.$setImageUrl(res.data.rectificationNoticeImgUrl);
+ // this.signatureUrl = this.$setImageUrl(res.data.signaturePath);
if (res.data.placePoiLabelVOList.length) {
this.label = res.data.placePoiLabelVOList[res.data.placePoiLabelVOList.length - 1]
.labelName;
}
let ids = [];
for (let i of data.taskPlaceRecordVOList) {
- if ((data.status == 4 || data.status == 3) && this.roleType == 2) {
- if (i.rectificationImageUrls) {
- i.urls = this.$setImageUrl(i.rectificationImageUrls, 2);
- } else {
- i.urls = [];
- }
- }
+ // if ((data.status == 4 || data.status == 3) && this.roleType == 2) {
+ // if (i.rectificationImageUrls) {
+ // i.urls = this.$setImageUrl(i.rectificationImageUrls, 2);
+ // } else {
+ // i.urls = [];
+ // }
+ // }
if (i.state == 0) {
ids.push(i.itemId)
}
@@ -243,12 +247,8 @@
getItem() {
let data = {
- childType: 1,
- type: 1
- }
- if (this.type == 2) {
- data.childType = 9;
- data.type = 3;
+ childType: 9,
+ type: 3
}
getPlaceCheckItem(data).then(res => {
if (res.code == 200) {
@@ -327,7 +327,6 @@
if (data.status == 4) {
data.status = 1;
}
- data.type = 2;
addPlaceCheckReform(data).then(res => {
uni.hideLoading()
if (res.code == 200) {
@@ -349,8 +348,7 @@
taskId: this.info.taskId,
status: val.type,
rectificationFlag: val.type == 3 ? 1 : 2,
- reasonFailure: val.remark,
- type: 2
+ reasonFailure: val.remark
}).then(res => {
uni.hideLoading()
if (res.code == 200) {
@@ -364,8 +362,9 @@
navTo() {
uni.navigateTo({
- url: `/subPackage/label/check?taskId=${this.info.taskId}`
+ url: `/subPackage/school/securityReform?taskId=${this.info.taskId}`
})
+
},
}
--
Gitblit v1.9.3