From 4079fa7a47eaf035c92f944d0f6c2273ce92bcce Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 12 Apr 2023 10:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=B0=8F=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home_.vue                          | 18 ++++++++++++++++--
 pages/login/login_.vue                        |  8 +++++++-
 pages/workSpace/operation/operationCreate.vue |  2 +-
 pages/workSpace/operation/workerList.vue      |  8 ++++----
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/pages/home/home_.vue b/pages/home/home_.vue
index 97dadd6..5fe537e 100644
--- a/pages/home/home_.vue
+++ b/pages/home/home_.vue
@@ -150,12 +150,17 @@
 				</view>
 			</view>
 		</view>
-	<u-popup :round="10" v-model="dShow" mode="center" border-radius="14">
+		<view v-show="dShow" style="position: fixed;top: 0;left: 0;width: 100%;height: 100%;background: rgba(0, 0, 0, .5);z-index: 999;">
+			 <view style="position: absolute;padding: 50rpx;background: #ffffff;display: inline-block;margin: auto;top: 40%;left: 50%;transform: translateX(-50%);">
+			 	下载中 请勿退出 {{percentVal}}%
+			 </view>
+		</view>
+	<!-- <u-popup :round="10" v-model="dShow" :mode="popupData.mode" border-radius="14"  :overlay="popupData.overlay" :closeable="popupData.closeable"  :closeOnClickOverlay="popupData.closeOnClickOverlay">
 		<view style="margin: 30rpx">
 			下载中 请勿退出 {{percentVal}}%
 		</view>
 			
-	</u-popup >
+	</u-popup > -->
 	</view>
 </template>
 
@@ -164,6 +169,12 @@
 		data() {
 			return {
 				dShow: false,
+				popupData: {
+					overlay: true,
+					mode: 'center',
+					closeable: false,
+					closeOnClickOverlay: false
+				},
 				percentVal: 0,
 				cateAggForm: {
 					start_create: '',
@@ -213,6 +224,7 @@
 
 		},
 		methods: {
+			closeP(){},
 			checkVersion() {
 				let that = this;
 				uni.getSystemInfo({
@@ -235,11 +247,13 @@
 													fullurl = that.vuex_host + res1.file
 												}
 												that.dShow = true // show变量控制一个下载进度弹框（这个UI样式自己写即可）
+												uni.hideTabBar()
 												// 创建一个下载任务，并根据后端返回的apk静态资源地址filePath进行下载
 												var dtask = plus.downloader.createDownload(fullurl, {}, function(d, status) {
 														// 下载完成  
 														if (status == 200) {
 																that.dShow = false // 下载完成再把下载进度弹框关闭即可
+																uni.showTabBar();
 																plus.runtime.install(plus.io.convertLocalFileSystemURL(d
 																		.filename), {}, {}, function(error) {
 																		uni.showToast({
diff --git a/pages/login/login_.vue b/pages/login/login_.vue
index f848ebc..4711812 100644
--- a/pages/login/login_.vue
+++ b/pages/login/login_.vue
@@ -565,8 +565,14 @@
 									}
 								})
 							})
+						}else{
+							
 						}
-					}
+					},
+					complete:function(){
+						uni.hideLoading();
+					},
+					
 				});
 			}
 		}
diff --git a/pages/workSpace/operation/operationCreate.vue b/pages/workSpace/operation/operationCreate.vue
index e872588..0e89cc9 100644
--- a/pages/workSpace/operation/operationCreate.vue
+++ b/pages/workSpace/operation/operationCreate.vue
@@ -322,7 +322,7 @@
 			//获取dept
 			getdept() {
 				let that = this;
-				that.$u.api.deptList({page: 0}).then(res => {
+				that.$u.api.deptList({page: 0,type__in:'dept,company'}).then(res => {
 					that.depRange = resetData(res);
 				})
 			},
diff --git a/pages/workSpace/operation/workerList.vue b/pages/workSpace/operation/workerList.vue
index 60f6ca7..79f51da 100644
--- a/pages/workSpace/operation/workerList.vue
+++ b/pages/workSpace/operation/workerList.vue
@@ -59,11 +59,11 @@
 				</form>
 			</view>
 		</view>
-		<view class="apply-info" style="min-height: fit-content; display: flex;">
-			<button type="primary" plain="true" style="width: 25%;" @click="goBack">上一步</button>
-			<button v-for=" item in initform.transitions" :key="item.id" @click="submitticket(item.id)" type="primary" style="width: 25%;" v-if="!showN">{{item.name}}
+		<view class="apply-info" style="min-height: fit-content; display: flex;flex-flow:row wrap;">
+			<button type="primary" plain="true" style="min-width: 80px;" @click="goBack">上一步</button>
+			<button v-for=" item in initform.transitions" :key="item.id" @click="submitticket(item.id)" type="primary" style="min-width: 80px;" v-if="!showN">{{item.name}}
 			</button>
-			<button type="primary" style="width: 25%;" @click="nexStep" v-if="showN">下一步</button>
+			<button type="primary" style="min-width: 80px;" @click="nexStep" v-if="showN">下一步</button>
 		</view>
 
 	</view>