完善质控、上传整改页面

pages/ypczk/djfk/djfkTask/allTask.vue

@@ -5,28 +5,28 @@
 			<custom-tab-pane label="全部" name="allTaskListViewRef_1" class="allTaskList_tab">
 				<TotalTask :taskList="pageData.taskList"></TotalTask>
 				<view>
-					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText"></uni-load-more>
+					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText" v-if="pageData.taskList.length!=0"></uni-load-more>
 				</view>
 			</custom-tab-pane>
 			<!-- 待整改 -->
 			<custom-tab-pane label="待整改" name="allTaskListViewRef_2" class="allTaskList_tab">
 				<DaiZgTask :taskList="pageData.taskList"></DaiZgTask>
 				<view>
-					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText"></uni-load-more>
+					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText" v-if="pageData.taskList.length!=0"></uni-load-more>
 				</view>
 			</custom-tab-pane>
 			<!-- 审核中 -->
 			<custom-tab-pane label="审核中" name="allTaskListViewRef_3" class="allTaskList_tab">
 				<ShenheTask :taskList="pageData.taskList"></ShenheTask>
 				<view>
-					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText"></uni-load-more>
+					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText" v-if="pageData.taskList.length!=0"></uni-load-more>
 				</view>
 			</custom-tab-pane>
 			<!-- 完成 -->
 			<custom-tab-pane label="完成" name="allTaskListViewRef_4" class="allTaskList_tab">
 				<WanchenTask :taskList="pageData.taskList"></WanchenTask>
 				<view>
-					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText"></uni-load-more>
+					<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText" v-if="pageData.taskList.length!=0"></uni-load-more>
 				</view>
 			</custom-tab-pane>
 		</custom-tabs>

pages/ypczk/djfk/index/djfkIndex.vue

@@ -57,7 +57,7 @@
 			</uni-card>
 		</view>
 		<!-- 整改通知 -->
-		<uni-popup ref="zgDialog" type="dialog" :is-mask-click="false" @change="changeHandler">
+		<uni-popup ref="zgDialog" type="dialog" :is-mask-click="false">
 			<RectificationNotice :know="know" :data="currentPopupData"></RectificationNotice>
 		</uni-popup>
 	</view>
@@ -133,7 +133,6 @@ const uploadZg=(e)=>{
 let num=0
 // 弹出框 我知道了
 const know=()=>{
-	console.log(pageData.noticeList.length);
 	zgDialog.value.close()
 	if(pageData.noticeList.length > num++){
 		http.get("app-api/rectify/readNotice",{id:pageData.noticeList[pageData.currentPopupDataInex].id}).then(res=>{
@@ -148,10 +147,6 @@ const know=()=>{
 	}
 }
 
-const changeHandler = (event)=>{
-	console.log(event)
-}
-
 // 获取整改列表
 const getZgList=()=>{
 	http.get("app-api/rectify/findZgTaskList",{status:'0'}).then(res=>{
@@ -163,7 +158,12 @@ const getZgList=()=>{
 
 // 获取整改通知
 const getNotice=()=>{
+	uni.showLoading({
+		title: '',
+		mask: true
+	});
 	http.get("app-api/rectify/findNoticeList").then(res=>{
+		uni.hideLoading()
 		console.log(res);
 		pageData.noticeList=res
 		if(res.length!=0 && res!=[]){

pages/ypczk/djfk/index/rectificationNotice.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="rectification_notice"  v-if="data!=null">
 		<uni-title type="h1" title="整改通知" align="center" class="rectification_notice_title"></uni-title>
-		<view class="rectification_notice_content" v-for="(item,index) in noticelist">
+		<view class="rectification_notice_content" v-for="(item,index) in noticeList">
 			{{(index+1)+". "+item}}
 		</view>
 		<view class="rectification_notice_deadline">
@@ -18,14 +18,14 @@
 
 <script setup>
 import { onShow } from "@dcloudio/uni-app";
+import { computed } from "vue";
 const props=defineProps({
 	know:Function,
 	data:Object
 })
 
-let noticelist=[]
-onShow(()=>{
-	noticelist = props.data.rectificationItems.slice(0,-1).split("^^")
+const noticeList=computed(()=>{
+	return props.data.rectificationItems.slice(0,-1).split("^^")
 })
 
 </script>

pages/ypczk/djfk/uploadZg/rectification.vue

@@ -107,8 +107,12 @@ const finishTask=()=>{
 	saveData.taskInfo=pageData.zkInfoList
 	saveData.zgInfo=pageData.zgInfoList
 	saveData.detail=pageData.zgMeasureList
+	uni.showLoading({
+		title: '提交中.....',
+		mask: true
+	});
 	http.post("app-api/rectify/save",saveData).then(res=>{
-		console.log(res)
+		uni.hideLoading()
 		uni.navigateBack({
 			delta: 1
 		});
@@ -122,13 +126,17 @@ const showImage=(id)=>{
 
 // 获取整改数据
 const getRectificationData=()=>{
+	uni.showLoading({
+		title: '',
+		mask: true
+	});
 	http.get("app-api/rectify/getZgDetail",{id:pageData.id}).then(res=>{
+		uni.hideLoading()
 		console.log(res)
 		pageData.zkInfoList=res.taskInfo
 		pageData.zgInfoList=res.zgInfo
 		pageData.zgMeasureList=res.detail
 		res.detail.forEach(item=>{
-			console.log(item.measureUrls);
 			if(typeof(item.measureUrls)=='string'){
 				var urls=item.measureUrls.split(",")
 				item.measureUrls=[]
@@ -137,9 +145,7 @@ const getRectificationData=()=>{
 				})
 			}
 		})
-		
 	})
-	
 }
 
 onShow(()=>{

pages/ypczk/djfk/uploadZg/zgMeasureList.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script setup>
-import { reactive } from "vue";
+import { reactive,watch } from "vue";
 import {uploadImageModelValue} from '@/pages/controls/image/OssService';
 import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
 import http from '@/utils/request';
@@ -72,10 +72,6 @@ const showImage=(id)=>{
 	return uploadImageModelValue(id)
 }
 
-onShow(()=>{
-	console.log(props.disabled);
-})
-
 </script>
 
 <style>

pages/ypczk/index/leaderIndex.vue

@@ -77,7 +77,7 @@ const pageData=reactive({
 	taskId:'',
 	headImg:'/static/logo.png',
 	userName:'',
-	taskNum:2,
+	taskNum:0,
 	taskList:[],
 	// 对话框
 	popupMessage:{

pages/ypczk/zkTask/djhjTask.vue

@@ -175,13 +175,13 @@ const countDownEnd=()=>{
 // 选中图片，将选中的图片添加列表
 const selectImg=(e)=>{
 	e.tempFiles.forEach(item=>{
-    uni.showLoading({
-      title: '图片上传....',
-      mask: true
-    });
-	http.upload("oss/upload",{file:item.file}).then(e => {
-      uni.hideLoading()
-      item.id = e.id
+		uni.showLoading({
+			title: '图片上传....',
+			mask: true
+		});
+		http.upload("oss/upload",{file:item.file}).then(e => {
+			uni.hideLoading()
+			item.id = e.id
 			console.log(e.id);
 			pageData.resList.detail.imageIds=[]
 			pageData.imageIdList.push(e.id)

pages/ypczk/zkTask/dpTask.vue

@@ -71,14 +71,13 @@
 </template>
 
 <script setup>
-import {reactive,onMounted,ref,watch,defineComponent} from 'vue';
+import {reactive,onMounted,ref,watch,defineComponent, computed} from 'vue';
 import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
 import http from '@/utils/request';
 import {uploadImageModelValue} from '@/pages/controls/image/OssService'
 
 const data = reactive({
-	reciper: '',
-	aa: ''
+	reciper: ''
 })
 
 const pageData = reactive({

pages/ypczk/zkTask/zkTaskDetail/djhjTaskDetail.vue

@@ -11,7 +11,7 @@
 				<text class="creator_title">创建人<text class="creator_text">{{props.creatorName}}</text></text>
 			</view>
 			<!-- 检查结果 -->
-			<uni-card padding="0" spacing="0" v-for="(item,index) in hjTaskList" class="djhjList">
+			<uni-card padding="0" spacing="0" v-for="(item,index) in props.hjTaskList" class="djhjList">
 				<view class="djhjList_title">
 					<view class="djhjList_text">检查项目</view>
 					<view class="djhjList_righttext">{{item.item}}</view>
@@ -38,7 +38,7 @@
 				<uni-card>
 					<uni-section title="图片" type="line"></uni-section>
 					<view class="img_upload">
-						<uni-file-picker :readonly="true" limit="4" :modelValue="showImage(pageData.imageList)"></uni-file-picker>
+						<uni-file-picker :readonly="true" limit="4" :modelValue="showImage(props.imageUrl)"></uni-file-picker>
 					</view>
 				</uni-card>
 			</view>
@@ -67,20 +67,10 @@ const props = defineProps({
 	creatorName:String
 });
 
-const pageData=reactive({
-	djhjList:[],
-	imageList:props.imageUrl
-})
-
 // 显示图片
 const showImage=(id)=>{
 	return uploadImageModelValue(id)
 }
-
-onShow(()=>{
-	console.log(pageData.imageList);
-})
-
 </script>
 
 <style lang="scss" scoped>

pages/ypczk/zkTask/zkTaskList.vue

@@ -173,10 +173,6 @@
 		const taskList = proxy.$refs[IndexName.value]
 		return taskList
 	}
-
-	// 跳转到任务详情
-	const toDetail = () => {
-	}
 	
 	// 页面滚动触发事件
 	onPageScroll((detail) => {