From 2d95e769f7dcdc30e2ba699d6674820787b5e5fb Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 03 Feb 2024 11:05:31 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/checkReform.vue | 58 +++++++++++++++++-----------
subPackage/workbench/views/cscj.vue | 29 +++++++++-----
subPackage/workbench/views/audit.vue | 12 +++++-
3 files changed, 64 insertions(+), 35 deletions(-)
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index c7b0d25..2522956 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -192,11 +192,18 @@
},
navTo(id, reportType, status, type) {
if (status == 4) {
- if (uni.getStorageSync("activeRole").roleName == "民警") {
+
+ if (reportType == 8) {
this.navToDetail(reportType, id, type)
} else {
- this.navToEdit(reportType, id, type);
+ if (uni.getStorageSync("activeRole").roleName == "民警") {
+ this.navToDetail(reportType, id, type)
+ } else {
+ this.navToEdit(reportType, id, type);
+ }
}
+
+
} else {
this.navToDetail(reportType, id, type)
}
@@ -224,6 +231,7 @@
} else if (reportType == 6) {
this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
} else {
+
this.$u.func.globalNavigator(`checkReform?id=${id}`)
}
},
diff --git a/subPackage/workbench/views/checkReform.vue b/subPackage/workbench/views/checkReform.vue
index b662a6d..2620fa0 100644
--- a/subPackage/workbench/views/checkReform.vue
+++ b/subPackage/workbench/views/checkReform.vue
@@ -28,11 +28,6 @@
<text>地址</text>
<text class="item-content">{{info.location}}</text>
</view>
-
- <view class="item-row flex j-c-s-b a-i-c" v-if="info.remark">
- <text>其它隐患问题</text>
- <text class="item-content">{{info.remark}}</text>
- </view>
<view class="item-row flex j-c-s-b a-i-c" v-if="info.rectificationNoticeFlag == 2">
<text>下发整改通知</text>
<text class="item-content">是</text>
@@ -53,6 +48,17 @@
<text>其它隐患问题</text>
<text class="item-content">{{info.remark}}</text>
</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>
+ </view>
+ <view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
+ <text>驳回原因</text>
+ <text class="item-content">{{info.reasonFailure}}</text>
+ </view>
<view class="image-wrap bgc-ff" v-if="images.length">
<view class="mb-20">
@@ -63,7 +69,6 @@
<u-image :src="i" width="100rpx" height="100rpx"></u-image>
</view>
</view>
-
</view>
<view class="image-wrap bgc-ff" v-if="signatureUrl.length">
@@ -75,27 +80,18 @@
</view>
</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>
- </view>
- <view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
- <text>驳回原因</text>
- <text class="item-content">{{info.reasonFailure}}</text>
- </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.patrolRecordVOList">
- <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 1">
+ <!-- <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">{{i.title}}</text>
<text>不存在</text>
- </view>
- <u-collapse ref="collapse" v-if="i.id == n.itemId && n.state == 0">
- <u-collapse-item :name="index" :title="i.title" value="存在">
+ </view> -->
+ <u-collapse ref="collapse" :value="ids" v-if="i.id == n.itemId && n.state == 0">
+ <u-collapse-item :name="n.itemId" :title="i.title" value="存在">
<view class="mb-20" v-if="n.imageUrls">
<view class="f-26 mb-10 c-00">隐患照片</view>
<view class="flex flex-wrap">
@@ -148,7 +144,7 @@
</view>
<view class="blank"></view>
- <footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 1 || info.status == 3)" />
+ <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" />
</view>
</template>
@@ -174,7 +170,8 @@
signatureUrl: [],
label: "",
itemList: [],
- roleType: '' //1.民警/系统管理员 2.场所负责人
+ roleType: '', //1.民警/系统管理员 2.场所负责人
+ ids: []
}
},
async onLoad(option) {
@@ -191,6 +188,10 @@
await this.getItem();
this.getDetail(option.id);
},
+ onReady() {
+
+ },
+
methods: {
getDetail(id) {
getPlaceCheckReformDetail({
@@ -204,6 +205,7 @@
this.label = res.data.placePoiLabelVOList[res.data.placePoiLabelVOList.length - 1]
.labelName;
}
+ let ids = [];
for (let i of data.patrolRecordVOList) {
if ((data.status == 1 || data.status == 3) && this.roleType == 2) {
if (i.rectificationImageUrls) {
@@ -212,8 +214,18 @@
i.urls = [];
}
}
+ if (i.state == 0) {
+ ids.push(i.itemId)
+ }
}
+ this.ids = ids;
this.info = data;
+
+ this.$nextTick(() => {
+ this.$refs.collapse.init();
+ })
+
+
})
},
@@ -320,7 +332,7 @@
}).then(res => {
uni.hideLoading()
if (res.code == 200) {
- this.$showTips("操作成功");
+ this.$showTips("操作成功", "success");
setTimeout(() => {
uni.navigateBack()
}, 300)
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index be47c0d..c17f9f3 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -532,6 +532,7 @@
title: '详情'
})
}
+ this.getCurrentLocation();
},
@@ -608,7 +609,7 @@
async getAllBizDict() {
// 获取九小场所类型
- await this.getBizDict('nineType', this.nineTypeList)
+ // await this.getBizDict('nineType', this.nineTypeList)
// 获取阵地
await this.getBizDict('frontType', this.frontTypeList)
},
@@ -933,17 +934,25 @@
uni.getLocation({
type: 'gcj02', // 坐标系类型
success: (res) => {
- var latitude = res.latitude; // 维度
- var longitude = res.longitude; // 经度
+ // var latitude = res.latitude; // 维度
+ // var longitude = res.longitude; // 经度
- this.form.lng = longitude
- this.form.lat = latitude
- this.form.jwd =
- `${Number(res.longitude).toFixed(6)},${Number(res.latitude).toFixed(6)}`
-
+ // this.form.lng = longitude
+ // this.form.lat = latitude
+ // this.form.jwd =
+ // `${Number(res.longitude).toFixed(6)},${Number(res.latitude).toFixed(6)}`
},
- fail: function(res) {
- console.log('获取定位失败：' + res.errMsg);
+ complete: (res) => {
+ if (res.latitude) {
+ this.$set(this.form, "x", res.longitude)
+ this.$set(this.form, "y", res.latitude)
+ } else {
+ uni.showModal({
+ title: "提示！",
+ content: `获取定位信息失败 ${res.errMsg}`,
+ showCancel: false
+ })
+ }
}
});
},
--
Gitblit v1.9.3