| subPackage/school/securityDetail.vue | ●●●●● patch | view | raw | blame | history | |
| subPackage/school/troubleAuditList.vue | ●●●●● patch | view | raw | blame | history | |
| subPackage/school/troubleDetail.vue | ●●●●● patch | view | raw | blame | history | |
| subPackage/school/troubleList.vue | ●●●●● patch | view | raw | blame | history | |
| subPackage/workbench/views/audit.vue | ●●●●● patch | view | raw | blame | history |
subPackage/school/securityDetail.vue
@@ -109,8 +109,8 @@ <view class="mb-20" v-if="roleType == 2 || (roleType == 1 && n.rectificationImageUrls)"> <view class="f-26 mb-10 c-00">整改后照片</view> <u-upload v-if="roleType == 2 && (info.status == 4 || info.status == 3)" :fileList="n.urls" :previewFullImage="uploadConfig.previewFullImage" <u-upload v-if="roleType == 2 && info.rectificationFlag == 1" :fileList="n.urls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,n,m)" @delete="deleteImages($event,m)"> @@ -121,7 +121,7 @@ </u-upload> <view class="flex flex-wrap" v-if="info.status != 4 && n.rectificationImageUrls "> <view class="flex flex-wrap" v-if="info.status < 3 && n.rectificationImageUrls "> <view class="mr-20" v-for="r in ($setImageUrl(n.rectificationImageUrls))"> <u-image :src="r" width="140rpx" height="140rpx" @click="previewImage($setImageUrl(n.rectificationImageUrls),i)"></u-image> @@ -133,7 +133,7 @@ <view class="f-26 mb-10 c-00">整改后描述</view> <u-textarea v-model="n.rectificationRemark" placeholder="请输入整改后描述" placeholderClass="c-99 f-26" :disabled="roleType == 2 && (info.status == 4 || info.status == 3)?false:true"></u-textarea> :disabled="roleType == 2 && info.rectificationFlag == 1?false:true"></u-textarea> </view> </u-collapse-item> </u-collapse> @@ -144,9 +144,10 @@ <view class="blank"></view> <!-- <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 == 2"> </block> --> <audit-action v-if="roleType == 1 && info.status == 1 && info.rectificationFlag != 3" @handle="submitAudit" /> <block v-if="info.rectificationFlag == 1"> <footer-btn v-if="roleType == 2 &&( info.status == 3 || info.status == 1)" text="提交" @click="submitInfo()" /> @@ -188,6 +189,7 @@ } }, async onLoad(option) { console.log("===>", option) let { roleName, roleAlias @@ -232,13 +234,15 @@ } let ids = []; for (let i of data.taskPlaceRecordVOList) { if ((data.status == 4 || data.status == 3) && this.roleType == 2) { if (((data.status == 4 || data.status == 3) && this.roleType == 2) || (data .rectificationFlag == 1 && this.roleType == 2)) { if (i.rectificationImageUrls) { i.urls = this.$setImageUrl(i.rectificationImageUrls, 2); } else { i.urls = []; } } if (i.state == 0) { ids.push(i.itemId) } @@ -249,13 +253,13 @@ }, getItem() { let data = { getPlaceCheckItem({ childType: 9, type: 3 } getPlaceCheckItem(data).then(res => { }).then(res => { if (res.code == 200) { this.itemList = res.data; } }) }, @@ -322,6 +326,7 @@ if (i.urls) { i.rectificationImageUrls = this.setImages(i.urls) } i.type = 3; delete i.urls; } if (data.status == 3) { @@ -330,6 +335,7 @@ if (data.status == 4) { data.status = 1; } data.rectificationFlag = 2; auditPlaceCheck(this.info).then(res => { uni.hideLoading(); this.$showTips("操作成功", "success"); subPackage/school/troubleAuditList.vue
@@ -13,9 +13,9 @@ <text class="f-28">时间筛选</text> <u-icon name="arrow-down"></u-icon> </view> <u-search placeholder="请输入姓名" v-model="keyWord" :clearabled="true" :showAction="true" <!-- <u-search placeholder="请输入姓名" v-model="keyWord" :clearabled="true" :showAction="true" :animation="true" @search="searchConfirm" @clear="clearConfirm" @custom="searchConfirm"></u-search> @custom="searchConfirm"></u-search> --> </view> </view> @@ -23,7 +23,8 @@ <view class="list"> <view class="list-item bgc-ff mb-20" v-for="item in siteList" :key="item.id" @click="pushPage(item.id)"> <view class="item-title flex a-i-c j-c-s-b mb-20"> <text class="f-32 fw">{{ item.name}}</text> <text class="f-32 fw" v-if="item.type == 1">校园安全隐患排查</text> <text class="f-32 fw" v-if="item.type == 2">校园矛盾纠纷排查</text> <!-- <u-tag text="待审批" type="warning" plain plainFill></u-tag> --> <u-tag class="u_tag" size="mini" :text="findObjValue(item.confirmFlag, tabList).name" :type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag> @@ -216,7 +217,7 @@ return } uni.navigateTo({ url: `trouble?id=${id}` url: `troubleDetail?id=${id}` })
@@ -33,25 +33,19 @@ </view> </view> </view> <view class="image-wrap bgc-ff" v-if="roleType == 2"> <view class="image-wrap bgc-ff" v-if="roleTypeName == 'mj'"> <view class="mb-20"> 处理意见 </view> <view class="flex flex-wrap"> <u-textarea v-model="confirmNotion" placeholder=""></u-textarea> <u-textarea v-model="confirmNotion" placeholder="请输入处理意见" :disabled="info.confirmFlag == 2?true:false"></u-textarea> </view> </view> <view class="image-wrap bgc-ff" v-if="roleTypeName == 'xyzt' || roleType == 2"> <view class="image-wrap bgc-ff" v-if="roleTypeName == 'xyzt'"> <u-form labelWidth="70" :model="form" ref="form"> <u-form-item label="是否处理:" labelWidth="100" prop="isHandle"> <u-radio-group v-model="form.isHandle"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in statusList" :key="index" :label="item.name" :name="item.id"> </u-radio> </u-radio-group> </u-form-item> <u-form-item label="是否问题:" labelWidth="100" prop="isProblem"> <u-radio-group v-model="form.isProblem"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in statusList" :key="index" @@ -59,7 +53,15 @@ </u-radio> </u-radio-group> </u-form-item> <u-form-item label="是否上报:" labelWidth="100" prop="isReporting"> <u-form-item label="是否处理:" labelWidth="100" prop="isHandle" v-if="form.isProblem == 1"> <u-radio-group v-model="form.isHandle"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in statusList" :key="index" :label="item.name" :name="item.id"> </u-radio> </u-radio-group> </u-form-item> <u-form-item label="是否上报:" labelWidth="100" prop="isReporting" v-if="form.isHandle == 2"> <u-radio-group v-model="form.isReporting"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in statusList" :key="index" :label="item.name" :name="item.id"> @@ -68,12 +70,10 @@ </u-form-item> </u-form> </view> <audit-action @handle="submit" v-if="roleType == 2 && info.confirmFlag == 1"></audit-action> <audit-action @handle="submit" v-if="roleType == 2 && info.confirmFlag == 1 && roleTypeName == 'mj' "></audit-action> <footer-btn v-if="roleType == 1 && info.confirmFlag == 3" text="编辑" @click="navToEdit" /> <footer-btn v-if="roleTypeName == 'xyzt'" text="上报" @click="submitInfo" /> </view> </template> @@ -111,12 +111,16 @@ onLoad(option) { this.roleTypeName = uni.getStorageSync("activeRole").roleAlias; if (uni.getStorageSync("activeRole").roleName == "民警") { let { roleName, roleAlias } = uni.getStorageSync("activeRole"); this.roleTypeName = roleAlias; if (roleAlias == "mj" || roleAlias == "xyzt") { this.roleType = 2; } if (uni.getStorageSync("activeRole").roleName == "居民") { if (roleAlias == "inhabitant" || roleAlias == "xyty") { this.roleType == 1; } @@ -137,6 +141,15 @@ this.info = res.data; if (res.data.images) { this.images = this.$setImageUrl(res.data.images); } if (res.data.type == 1) { uni.setNavigationBarTitle({ title: "安全隐患排查详情" }) } else { uni.setNavigationBarTitle({ title: "矛盾纠纷排查详情" }) } }) }, @@ -167,6 +180,24 @@ }) }, submitInfo() { let data = { id: this.info.id, confirmFlag: 1, confirmNotion: this.confirmNotion } auditTroubleReport(data).then(res => { if (res.code == 200) { this.$showTips("操作成功", "success"); setTimeout(() => { uni.navigateBack(); }, 300) } }) }, navToEdit() { uni.navigateTo({ url: `edit?id=${this.info.id}` subPackage/school/troubleList.vue
@@ -53,11 +53,12 @@ }, methods: { getList() { getList(type) { getTroubleReportList({ current: this.currentPage, size: 10, houseCode: uni.getStorageSync("siteInfo").houseCode houseCode: uni.getStorageSync("siteInfo").houseCode, type: type // reportType: 2 // eventType: type }).then(res => { subPackage/workbench/views/audit.vue
@@ -262,7 +262,7 @@ this.$u.func.globalNavigator(`bailReportDetail?id=${id}`) } else if (reportType == 7 || reportType == 4) { if (reportType == 4) { this.$u.func.globalNavigator(`/subPackage/school/ securityDetail?id=${id}&type=2`) this.$u.func.globalNavigator(`/subPackage/school/securityDetail?id=${id}&type=2`) } else { this.$u.func.globalNavigator(`selfCheckDetail?id=${id}`) }
