前端

pages/erpbusiness/quality_testing.vue

@@ -19,16 +19,18 @@
 					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
+			<view style='align-items: center;justify-content: space-between;' class='flex'>
 			<view class='changewarehouse'>
 				<view  @click='show=true'>{{warehouseName?warehouseName:'选择仓库'}}<text class='cuIcon-unfold'></text></view>
 				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"
 					:range="selector"></u-picker>
 			</view>
-			<view >
-			<view  @click='show=true' class="company">
+			<view class="company">
 				<image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png"
 					mode=""></image> {{compName}}
 			</view>
+			<u-picker @confirm='compconfirm' mode="selector" v-model="show1" :range="companyList"
+				range-key="compName"></u-picker>
 			</view>
 		</view>
 		<view class="content">
@@ -165,6 +167,7 @@
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
+				show1:false,
 				gridCol: 4,
 				show: false,
 				pageSize: 10,
@@ -184,6 +187,7 @@
 				commonWarehouseNo: '',
 				cangid: '',
 				warehouse: {},
+				companyList:[]
 
 			}
 		},
@@ -240,6 +244,7 @@
 			this.managementType = options.managementType
 		},
 		onShow() {
+			this.companyList=uni.getStorageSync('companyList')
 			uni.setStorageSync('isClick', false)
 			uni.showLoading({
 				title: "正在加载"
@@ -1153,14 +1158,14 @@
 		padding-bottom: 150rpx;
 	}
 	.company {
-		position: fixed;
+	/* 	position: fixed;
 		right: 0;
-		top: 18%;
-		background: url('../../static/img/qiyebeijing.png');
-		background-size: 100%;
+		top: 18%; */
+	/* 	background: url('../../static/img/qiyebeijing.png');
+		background-size: 100%; */
 		font-size: 11px;
 		padding-bottom: 5px;
-		padding-left: 10px;
+		padding-right: 20px;
 		border-radius: 40rpx 0 0 40rpx;
 	}
 	

pages/task/my_task.vue

@@ -6,7 +6,7 @@
 					placeholder="请输入任务日期或任务标题" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
-			<view  @click='show=true' class="company">
+			<view class="company">
 				<image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png"
 					mode=""></image> {{compName}}
 			</view>
@@ -215,6 +215,8 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
+			var that =this
+			that.compName = uni.getStorageSync('compName1')
 			if(this.statusFlag==1){
 				this.taskInfo=[]
 				this.pages=1
@@ -921,13 +923,14 @@
 	}
 	.company {
 		// position: fixed;
-		right: 0;
+		// right: 0;
 		// top: 18%;
-		background: url('../../static/img/qiyebeijing.png');
-		background-size: 100%;
+		// background: url('../../static/img/qiyebeijing.png');
+		// background-size: 100% 100%;
+		text-align:right;
 		font-size: 11px;
 		padding-bottom: 5px;
-		padding-left: 10px;
+		padding-right: 10px;
 		border-radius: 40rpx 0 0 40rpx;
 	}
 	

pages/user/user.vue

@@ -490,6 +490,7 @@
 				}).then(res => {
 					if (res.data.data) {
 						that.companyList = res.data.data
+						uni.setStorageSync('companyList', that.companyList)
 						console.log("that.3333")
 						console.log(that.companyList)
 						if (that.companyList.length > 0) {