From 3d25ba30dd249e4b12737088c83a1b79645e445e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 27 Apr 2024 13:50:09 +0800
Subject: [PATCH] 更新
---
pages/login/login-account.vue | 2
pages/home/launch.vue | 2
subPackage/school/troubleDetail.vue | 85 +++++++++++++++++++++++++++++++++++-------
3 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/pages/home/launch.vue b/pages/home/launch.vue
index 8ef86d4..49e212e 100644
--- a/pages/home/launch.vue
+++ b/pages/home/launch.vue
@@ -18,7 +18,7 @@
navTo() {
var config = {
id: "wx41aa8a5d2e565a05",
- path: "page/login/login",
+ path: "page/login/login-account",
version: "develop",
query: {
type: 1
diff --git a/pages/login/login-account.vue b/pages/login/login-account.vue
index 7eed2bf..40f1fc5 100644
--- a/pages/login/login-account.vue
+++ b/pages/login/login-account.vue
@@ -181,7 +181,7 @@
}
- uni.setStorageSync("pageType", 1);
+ // uni.setStorageSync("pageType", 1);
this.screenHeight = `${uni.getSystemInfoSync().screenHeight}px`;
this.form.phone = uni.getStorageSync("phoneNmber");
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index 61e821a..27be7e8 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/subPackage/school/troubleDetail.vue
@@ -1,6 +1,12 @@
<template>
<view class="">
+
+ <view class="item-row flex j-c-s-b a-i-c">
+ <text>场所名称</text>
+ <text class="item-content">{{info.placeName}}</text>
+ </view>
+
<view class="item-row flex j-c-s-b a-i-c">
<text>描述</text>
<text class="item-content">{{info.remark}}</text>
@@ -34,15 +40,39 @@
</view>
</view>
</view>
- <view class="image-wrap bgc-ff" v-if="roleTypeName == 'mj'">
- <view class="mb-20">
- 处理意见
+
+ <block v-if="roleTypeName == 'mj'">
+ <view class="image-wrap bgc-ff">
+ <view class="mb-20">
+ 处理意见
+ </view>
+ <view class="flex flex-wrap">
+ <u-textarea v-model="confirmNotion" placeholder="请输入处理意见"
+ :disabled="info.confirmFlag == 2?true:false"></u-textarea>
+ </view>
</view>
- <view class="flex flex-wrap">
- <u-textarea v-model="confirmNotion" placeholder="请输入处理意见"
- :disabled="info.confirmFlag == 2?true:false"></u-textarea>
+
+ <view class="image-wrap bgc-ff">
+ <view class="mb-20">
+ 工作照片
+ </view>
+
+ <view class="flex-wrap" v-if="info.confirmFlag == 2">
+ <view class="mr-20" v-for="i in images">
+ <u-image :src="i" width="140rpx" height="140rpx" @click="previewImage(images,i)"></u-image>
+ </view>
+ </view>
+ <u-upload v-else :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>
+
+ </block>
+
<view class="image-wrap bgc-ff" v-if="roleTypeName == 'xyzt'">
@@ -74,7 +104,7 @@
<!-- <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'" @click="submitInfo" />
+ <footer-btn v-if="roleTypeName == 'xyzt' && info.confirmFlag == 4 " @click="submitInfo" />
<footer-btn v-if="roleType == 2 && info.confirmFlag == 1 && roleTypeName == 'mj'" text="确定"
@click="submitInfo" />
</view>
@@ -82,6 +112,7 @@
</template>
<script>
+ import uploadMixin from "@/mixin/uploadMixin";
import auditAction from '@/components/btn/actionBtn.vue'
import {
getTroubleReportDetail,
@@ -91,6 +122,7 @@
components: {
auditAction
},
+ mixins: [uploadMixin],
data() {
return {
info: {},
@@ -98,7 +130,9 @@
id: "",
images: [],
confirmNotion: "",
- form: {},
+ form: {
+ images: []
+ },
statusList: [{
name: "是",
id: 1
@@ -143,8 +177,8 @@
id
}).then(res => {
this.info = res.data;
- if (res.data.images) {
- this.images = this.$setImageUrl(res.data.images);
+ if (res.data.workImage) {
+ this.images = this.$setImageUrl(res.data.workImage);
}
if (res.data.type == 1) {
uni.setNavigationBarTitle({
@@ -217,10 +251,20 @@
this.$showTips("请输入处理意见")
return;
}
+ if (this.form.images.length) {
+ let urls = []
+ this.form.images.forEach(e => {
+ urls.push(e.name)
+ })
+ this.form.workImage = urls.join(",")
+ } else {
+ this.$showTips("请上传工作照片")
+ return;
+ }
data.confirmFlag = 2;
data.confirmNotion = this.confirmNotion
+ delete this.form.images;
}
-
auditTroubleReport(data).then(res => {
if (res.code == 200) {
this.$showTips("操作成功", "success");
@@ -231,14 +275,11 @@
})
},
-
navToEdit() {
uni.navigateTo({
url: `edit?id=${this.info.id}`
})
},
-
-
}
}
</script>
@@ -274,4 +315,18 @@
margin-right: 20rpx;
}
}
+
+
+ .upload-item {
+ width: 140rpx;
+ height: 140rpx;
+ border: 1px solid #EEEEEE;
+ }
+
+ .upload {
+ margin: 0 30rpx;
+ padding: 30rpx;
+
+
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3