小程序调整

apis/pagejs/index.js

@@ -68,3 +68,24 @@ export function deviceTypeList(data) {
 	})
 }
 
+
+
+export function validateCode(data) {
+	 
+	return requestWhite({
+		method: 'post',
+		data:data ,
+		url: '/mobile/user/validateCode'
+	})
+} 
+
+export function getVerifyCode(tel) {
+	 
+	return requestWhite({
+		method: 'post',
+		data:{
+			telephone:tel
+		} ,
+		url: '/mobile/user/getVerifyCode'
+	})
+} 

apis/utils/init.js

@@ -1,104 +1,56 @@
 import carhelp from '@/apis/utils/mixin.js'
 
 import * as API_WeiXin from '@/apis/weixin.js'
-
-import {
-	getUrlParam,
-	getWeixinRedirectURI,
-	isWeiXin
-} from '@/apis/utils'
-var checkOpenId = true; //是否需要获取openId
-var openId = carhelp.getOpenId();
+ 
+ var openId = carhelp.getOpenId();
 
 var app = {
-	init: function() {
-		// isWeiXin()|| 
-		if(!(process.env.NODE_ENV === "development") ){
-			if (isWeiXin()) {
-				if (checkOpenId) {
-					if (!openId) {
-						this.getOpenId();
-					} else {
-						this.getPersion(openId)
-					}
-				}
-			} else{
-				var NODE_NAME=  process.env['NODE_NAME']
-				if(NODE_NAME=="production"){
-					alert("请使用微信打开本页面")
-				}
-			}
-		}else{
-			carhelp.setOpenId(process.car.openId)
-			this.getPersion(process.car.openId)
-		}
-		
-		
+	init: function() {
+		
+		// #ifdef H5
+			console.log("SIMPLE_RUN 模式，取配置固定openId  可修改SIMPLE_RUN ")
+			carhelp.setOpenId(process.car.openId)
+		// #endif
+		
+		// #ifdef MP-WEIXIN
+			if(process.car.SIMPLE_RUN&& process.env.NODE_ENV === "development" ){
+				console.log("SIMPLE_RUN 模式，取配置固定openId  可修改SIMPLE_RUN ")
+				carhelp.setOpenId(process.car.openId)
+				
+			}else{
+				if (!openId) {
+					this.getOpenId()
+				}
+			}
+			
+		// #endif
+
 	},
-	 getPersion(thisopenId){
-		 var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
-		 var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
-		 
-		  if(token_tdate&&token_tdate==tdate){
-			return
-		  }
-		  
-		 var loginurl="/mobile/user/findByOpenId"
-		  
-		 uni.request({
-		 	method:'get',
-		 	url: process.car.BASE_URL + loginurl,
-		 	data: {
-		 		openId:thisopenId,
-		 	},
-		 	header: {
-		 		'Content-Type': 'application/x-www-form-urlencoded',
-		 		'X-Requested-With': 'XMLHttpRequest',
-		 		//'Authorization':token
-		 	}
-		 }).then((response) => {
-		 	let [error, res] = response;
-		 	
-		 	if (res.data.code == 200&&res.data.result) {
-		 		
-		 		var token = res ? res.data.data.token : '';
-		 		carhelp.setPersonInfo(res.data.data.regUser );
-		 		carhelp.setPersonInfoPlus(res.data.data );
-		 		
-		 		carhelp.setToken(token);
-		 	 
-		 	}else{
-				carhelp.logoff();
-			}
-		 }).catch(error => {
-		 	
-		 	
-		 })
-	 },
+	 	
 	getOpenId() {
-		
-		const code = getUrlParam('code');
-		var openId = carhelp.getOpenId()
-		if (!openId) {
-			if (!code) {
-				var url = document.URL;
-				var getUrl= getWeixinRedirectURI(process.car.VUE_APP_WXAPPID, url);
-				 
-				window.location.href = getUrl;
-			} else {
-				
-				API_WeiXin.getDataByCode(code).then(response => {
-					
-					carhelp.setOpenId(response.data.openid)
-					openId = response.data.openid;
-					carhelp.set("xpgj_wx_user_info",response.data)
-					
-					 location.reload();
-				}).catch(error => {
-					console.log(error);
-				});
-			}
+		var openId = carhelp.getOpenId()
+		if (!openId) {
+		
+			uni.login({
+				provider: 'weixin',
+				success: loginRes => {
+					
+					API_WeiXin.findAppletUserInfo(loginRes.code).then(response => {
+						carhelp.setOpenId(response.data)
+						//user_info 等属性 ，头像，名称，可通过授权获得  uniapp方法申请
+						//carhelp.set("xpgj_wx_user_info",response.data)
+						if(this.onload){
+							this.onload();
+						}						
+					}).catch(error => {
+						console.log(error);
+					});
+				}
+			});
+			
 		}
-	}
+	
+	}
+
 }
 module.exports = app

apis/utils/mixin.js

@@ -115,7 +115,7 @@ var app = {
 		uni.setStorageSync(prefix + 'token', value)
 		
 		if(value){
-			var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
+			var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,13).replace("T"," ")
 			uni.setStorageSync(prefix + 'token_tdate', tdate)
 		}
 	}

apis/utils/request.js

@@ -4,8 +4,8 @@ import requestSon from './requestSon.js';
 
 const request = (options) => {
 	//记录请求次数和响应次数
-	var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
-	var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
+	var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,13).replace("T"," ")
+	var token_tdate=carhelp.get("token_tdate");//每60分钟存储一次token
 	
 	var token=carhelp.getToken(options);
 	

apis/weixin.js

@@ -1,52 +1,27 @@
-import request from '@/apis/utils/request'
+import request from '@/apis/utils/requestWhite'
 import requestWhite from '@/apis/utils/requestWhite.js';
 // import requestAli from '../utils/requestParking.js';
  
-import Qs from 'qs';
 
-//微信支付
-export function wxpay(data) {
-	if(data){
-		data.type="E"
-	}
-	if(data&&!data.recordId){
-		data.recordId=''
-	}
-	return request({
-		url: '/wxPay/wxJsapiPay',
-		data: data,
-		method: 'post',
-	})
-}
 
-
-export function alpay(data) {
-	if(data&&!data.recordId){
-		data.recordId=''
-	}
+//根据code换取openid
+export function getDataByCode(code) {
 	return request({
-		url: '/aliPay/tradePrecreatePay',
-		data: data,
-		method: 'post',
+		url: '/wechat/findUserInfo/' + code,
+		params: {},
+		method: 'get',
 	})
 }
 
 //根据code换取openid
-export function getDataByCode(code) {
+export function findAppletUserInfo(code) {
 	return request({
-		url: '/wechat/findUserInfo/' + code,
+		url: '/wechat/findAppletUserInfo/' + code,
 		params: {},
 		method: 'get',
 	})
 }
 
-// export function getDataByCodeALI(code) {
-// 	return requestAli({
-// 		url: '/aliPay/findUserInfo/' + code,
-// 		params: {},
-// 		method: 'get',
-// 	})
-// }
 
 
 //获得配置
@@ -59,19 +34,3 @@ export function getConfig() {
 		method: 'get',
 	})
 }
-
-export function checkSubscribe(data) {
-	return requestWhite({
-		url: '/wechat/checkSubscribe',
-		data: data,
-		method: 'post',
-	})
-}
-
-export function addPoint(data) {
-	return request({
-		url: '/mobile/points/addPoint',
-		data: data,
-		method: 'post',
-	})
-}

components/ApproveList.vue

@@ -24,7 +24,7 @@
 									{{item.userName}}
 								</view>
 								<view class="date">
-									{{item.approveTime}}
+									{{item.approveTime?item.approveTime:''}}
 								</view>
 							</view>
 							<view class="u-order-time">
@@ -147,7 +147,7 @@
 		background-color: #fff;
 		margin-top: 24rpx;
 		padding: 24rpx 32rpx;
-
+		padding-bottom:80px;
 		.title {
 			color: rgba(51, 51, 51, 1);
 			font-size: 32rpx;

components/ShareServer.vue

@@ -1,160 +0,0 @@
-<template>
-	<view></view>
-</template>
-
-<script>
-
-	import wx from 'weixin-js-sdk'
-	import * as API_WeiXin from '@/apis/weixin'
-
-	export default {
-		name: 'Share',
-		props: {
-			 
-		},
-		data() {
-			return {
-				id:'',
-				title:'',
-				url:'',
-				isLoading: false,
-				nowItem: {
-					shareTitle: '',
-					shareImg: '',
-					shareDescription: ''
-				}
-			}
-		},
-		created() {},
-		methods: {
-			 addPoint(){
-				 
-				 API_WeiXin.addPoint({
-					 id:this.id,
-					 pointCode:"70007"
-				 }).then(response => {
-					 
-				 })
-			 },
-			
-			//获取微信jssdk配置信息
-			get_wx_config() {
-				
-				
-				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
-					
-					
-					var wxconfig = response.data.wxConfig;
-					
-					console.log(wxconfig.nonceStr)
-					//this.wxConfig = wxconfig;
-				
-					wx.config({
-						debug: false, // 开启调试模式,
-						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
-						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
-						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
-						signature: wxconfig.signature, // 必填，签名，见附录1
-						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 
-						'onMenuShareQQ', 'onMenuShareQZone'] ,// 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-						//'checkJsApi',,'updateAppMessageShareData','updateTimelineShareData'
-					});
-					
-						console.log("aaa")
-					//this.wxShare()
-				}).catch(error => {
-					console.log(error)
-						console.log("errorerror")
-				})
-			},
-			setUrl(url){
-				this.url=process.car.IMG_URL+"railroad-phone/#"+url;
-			},
-			setTitle(text,id){
-				this.title=text;
-				this.id=id;
-				this.wxShare() 
-				
-			},
-			//微信分享自定义
-			wxShare() {
-				var userInfo=this.carhelp.getPersonInfo()
-				var img=process.car.IMG_URL+"railroad-phone/"+require("@/assets/img/logo.png")
-				
-				var title="[荆州市地方铁路有限公司微官网]"+this.title
-			//	var desc=
-				let joinUrl = this.url;
-				console.log(img);
-				console.log(title);
-				console.log(joinUrl);
-				var _this = this;
-				
-				wx.ready(function() {
-					
-					
-					// wx.updateTimelineShareData({
-					// 	title: title,
-					// //	desc:desc ,
-					// 	link: joinUrl,
-					// 	 imgUrl: img,
-					// 	success: function() {
-					// 		if(userInfo){
-					// 			//_this.addPoint()
-					// 		}
-					// 		// 设置成功
-					// 		_this.$emit("wxShare",null);
-					// 	}
-					// })
-					// wx.updateAppMessageShareData({
-					// 	title: title,
-					// //	desc:desc ,
-					// 	link: joinUrl,
-					// 	 imgUrl: img,
-					// 	success: function() {
-					// 		if(userInfo){
-					// 			//_this.addPoint()
-					// 		}
-					// 		// 设置成功
-					// 		_this.$emit("wxShare",null);
-					// 	}
-					// })
-					wx.onMenuShareAppMessage({
-						title: title,
-					//	desc:desc ,
-						link: joinUrl,
-						 imgUrl: img,
-						success: function() {
-							console.log('111')
-							if(userInfo){
-								_this.addPoint()
-							}
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
-					wx.onMenuShareTimeline({
-						title: title,
-						//desc:desc ,
-						link: joinUrl,
-						 imgUrl: img,
-						success: function() {
-								console.log('222')
-							if(userInfo){
-								_this.addPoint()
-							}
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
-				});
-			}
-		},
-		mounted() {
-			this.url=window.location.href;
-			this.get_wx_config();
-		},
-	}
-</script>
-
-<style>
-</style>

components/Tabbar.vue

@@ -1,95 +0,0 @@
-<template >
-	<view>
-		<u-tabbar v-model="myCurrent" :list="tabbarList" 
-		:before-switch="beforeSwitch" active-color="#1F4A99"  ></u-tabbar>
-		
-	</view>
-</template>
-
-<script>
- 	
- 	export default {
-		name:"tabbarJob",
-		props:{
-			current: 0,
-			elderStatus: false
-		},
-		data() {
-			return {
-				activeColor:"#1F4A99",
-				oldindex:this.current,
-				 myCurrent:this.current,
-				 tabbarList: [
-					 {
-					 
-				 		iconPath: "home",
-				 		selectedIconPath: "home-fill",
-				 		text: '主页 ',
-						pagePath2:"/",
-						login:false,
-				 	},
-					{
-					 
-						iconPath: "heart",
-						selectedIconPath: "heart-fill",
-						text: '职工之家 ',
-						pagePath2:"/pages/staffHome/staffHome",
-					
-					},
-				 	{
-				 		iconPath: "account",
-				 		selectedIconPath: "account-fill",
-				 		text: '我的',
-						login:true,
-						pagePath2:"/pages/mine/mine",
-				 	}
-			 ],
-			};
-			
-		},methods:{
-			setcount(c){
-				//this.myCurrent=c
-			},
-			beforeSwitch(index){
-			
-				var bl=false
-				
-				if(index==this.current){
-					
-					return false
-				}
-				//this.myCurrent=index
-				var url =this.tabbarList[index].pagePath2;
-				
-				if(this.tabbarList[index].login){
-					var userInfo=this.carhelp.getPersonInfo()
-					if(userInfo){
-						
-					}else{
-						url="/pages/login/index"
-						bl=true	
-					}
-					
-				}
-				uni.navigateTo({
-					url: url
-				})
-			
-				
-				
-			},
-			
-		},
-		mounted(){
-			
-		},destroyed(){
-			
-		}
-		
-		
-	}
-</script>
-
-<style>
-	 
-</style>

components/equipmentRetrieval.vue

@@ -0,0 +1,452 @@
+<template>
+	<view :class="{
+		iscomponents:iscomponents==1
+	}">
+		
+		<u-navbar title="出库申请" v-show="false" ref="navbar" ></u-navbar>
+		
+		<!-- 搜索 -->
+		<view class="search" v-if="iscomponents!=1" >
+			<u-icon name="arrow-left" @click="back()"  size="36"></u-icon>
+			<view class="search-box">
+				<u-search placeholder="搜索设备名称或型号" v-model="queryContent" :show-action="false">
+
+				</u-search>
+				<view class="search-btn" @click="form.pageIndex=1,getList()" >
+					<view class="text">
+						搜索
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="main">
+			<!-- 分类 -->
+			<view class="classify" v-if="!queryContentBl">
+				<view class="item " v-for="(item,index) in menuList" :key="index" @click="toggle(index)"
+					:class="{'checked':index ==checkindex }">
+					{{item.name}}<br/>
+				</view>
+				
+			</view>
+			<!-- 类型 -->
+			<view class="type" >
+			<view class="type-item">
+			<!-- 	<view class="title"  v-for="item in 4">
+					设备类型一
+				</view> -->
+				
+				<view class="content"  >
+					<view class="item" v-for="(item,i) in indexList"  @click="viewItem(item)" :key="i">
+						<view class="picture">
+							<img :src="item.imgUrl" alt="">
+						</view>
+						<view class="infos" :class="{
+							infosQuery:queryContentBl
+						}" >
+							<view class="name">
+								{{item.title}}
+							</view>
+							<view class="model">
+								<view class="infos-title">
+									型号：
+								</view>
+								<view class="value">
+									{{item.model}}
+								</view>
+							</view>
+							<view class="inventory">
+								<view class="infos-title">
+									库存：
+								</view>
+								<view class="value">
+									{{item.count}}
+								</view>
+							</view>
+							<view class="inventory"  v-if="queryContentBl">
+								<view class="infos-title">
+									分类：
+								</view>
+								<view class="value">
+									{{getMenuListName(item.typeId)}}
+								</view>
+							</view>
+						</view>
+						<view class="option" v-if="iscomponents==1" >
+							
+								<u-button v-if="deterItem(item)"  @click="ckItem(item)"
+								 style="height: 48rpx;"
+								 type="error" ><u-icon name="trash-fill"></u-icon>删除</u-button>
+								
+								<u-button v-else  @click="ckItem(item)"
+								 style="height: 48rpx;"
+								 type="primary" ><u-icon name="plus-circle"></u-icon>添加</u-button>
+								
+						</view>
+					</view>
+				</view>
+    </view>
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/index.js'
+	
+	export default {
+		props:{
+			iscomponents:{
+				default: ""
+			},
+			list:{
+			
+				 default: () => [],
+			}
+		},
+		data() {
+			return {
+				queryContent:"",
+				queryContentBl:false,
+				checkindex: 0,
+				indexList:[],
+				form:{
+					pageIndex:1,
+					pageSize:20,
+					list:[]
+				},
+				menuList: [
+					
+				]
+
+			}
+		},
+		computed:{
+			listcurrentlist(){
+				if(this.menuList.length==0){
+					return  []
+				}
+				var 	list=this.menuList[this.checkindex].list
+			
+				if(list){
+					return list
+				}else{
+					return  []
+				}
+				
+			}
+		},
+		mounted() {
+			
+			this.getDeviceTypeList();
+		},
+		onReady() {
+			//this.getList()
+		},
+		onReachBottom() {
+			this.myLoadmoreonReachBottom()
+			
+		},
+		methods: {
+			myLoadmoreonReachBottom(){
+				var obj=this.menuList[this.checkindex]
+				if(this.queryContentBl){
+					obj=this.form;
+				}
+				console.log(obj)
+				if (this.indexList < obj.recordsTotal) {			
+					this.myLoadmore();
+				}
+			},
+			getMenuListName(id){
+				var obj =this.menuList.filter(item=>{
+					
+					return id==item.typeId;
+				})
+				if(obj.length){
+					return obj[0].name
+				}
+				
+			},
+			getDeviceTypeList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.deviceTypeList({}).then((res) => {
+					
+					this.menuList = res.data.deviceTypeList.map(item=>{
+						return {
+							typeId:item.id,
+							name:item.name,
+							list:[],
+							pageIndex:1,
+							pageSize:10,
+							recordsTotal:0
+						}
+					});
+					uni.hideLoading();
+					if(this.menuList.length>0){
+						this.getList()
+					}
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			viewItem(item){
+				if(this.iscomponents==1){
+					
+				}else{
+					uni.navigateTo({
+						url:"./equipmentDetail?id="+item.id
+					})
+				}
+			},
+			deterItem(item){
+				var c=this.list.find(it=>{
+					
+					return it.obj.id==item.id
+				})
+				if(c){
+					return true
+				}else{
+					return false
+				}
+			},
+			ckItem(item){
+				this.$emit('ckItem',item)
+				
+			},
+			myLoadmore(){
+				if(this.queryContentBl){
+					this.form.pageIndex += 1;
+				}else{
+					this.menuList[this.checkindex].pageIndex += 1;
+					
+				}
+				this.getList();
+			},
+			getList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				 this.datainit()
+				 var list=this.indexList
+				 var data = this.menuList[this.checkindex];
+				
+				 if(this.queryContent){
+					 //this.queryContentBl=true
+					// 删除类型  delete data.list;
+					data=this.form
+					data.queryContent=this.queryContent;
+					
+				 }else{
+					 
+					  //this.queryContentBl=false
+				 }
+				 delete data.list;
+				 
+				API.deviceList(data).then((res) => {
+					if(data.pageIndex==1){
+						list = res.data.data;
+					}else{
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+					if(this.queryContent){
+						this.queryContentBl=true
+						this.form.recordsTotal = res.data.recordsTotal;
+					}else{
+						this.queryContentBl=false
+						this.menuList[this.checkindex].list=list
+								
+						this.menuList[this.checkindex].recordsTotal = res.data.recordsTotal;
+					}
+					
+					this.indexList=list;
+					uni.hideLoading();
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			datainit(){
+				// var data = this.menuList[this.checkindex];
+				//  if(!data.pageIndex){
+				// 	  this.menuList[this.checkindex].pageIndex=1;
+				// 	 this.menuList[this.checkindex].pageSize=10
+				// 	 this.menuList[this.checkindex].recordsTotal=0;
+				// 	  this.menuList[this.checkindex].list=[]
+				//  }
+			},
+			toggle(index) {
+				this.checkindex = index
+				
+				this.datainit()
+				
+				var list=this.menuList[this.checkindex].list
+						
+				this.indexList=list;
+				if(list.length==0){
+					this.getList()
+				}
+				
+				
+			},
+			back(){
+				this.$refs.navbar.goBack()
+			}
+			
+		},
+		
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		background-color: #fff;
+	}
+	.iscomponents /deep/.u-search{
+		width: 630rpx !important;
+	}
+	// 搜索
+	.search {
+		padding: 12rpx 24rpx;
+		display: flex;
+		border-radius: 8px;
+		overflow: hidden;
+
+		.search-box {
+			display: flex;
+			border-radius: 8px;
+			overflow: hidden;
+		}
+		
+		/deep/.u-search {
+			width: 530rpx;
+			margin: auto !important;
+			position: relative;
+			flex: 0;
+			margin: 0 !important;
+			height: 64rpx !important;
+		}
+
+		/deep/.u-content {
+			width: 430px;
+			border-radius: 0px !important;
+			height: 64rpx !important;
+		}
+
+		/deep/.u-icon--right {
+			margin-right: 16rpx;
+		}
+
+		.search-btn {
+			width: 100rpx;
+			height: 64rpx;
+			background-color: #f2f2f2;
+
+			.text {
+				height: 40rpx;
+				margin: 12rpx 0;
+				border-left: 1px solid #999999;
+				font-family: Microsoft Yahei;
+				text-align: center;
+				color: rgba(16, 98, 213, 1);
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	.main {
+		display: flex;
+
+		// 分类
+		.classify {
+			width: 170rpx;
+			height: calc(100vh - 88rpx);
+			background-color: #F0F0F0;
+			overflow-y: scroll;
+			font-size: 28rpx;
+
+			.item {
+				height: 120rpx;
+				line-height: 120rpx;
+				text-align: center;
+			}
+
+			.checked {
+				background-color: #fff;
+				color: #1062D5
+			}
+		}
+	// 类型
+	.type{
+		padding: 24rpx 24rpx;
+		height: calc(100vh - 88rpx);
+		
+		.type-item{
+			//margin-bottom: 80rpx;
+		}
+		.title{
+			color: rgba(51, 51, 51, 1);
+			font-size: 32rpx;
+			margin-bottom: 24rpx;
+		}
+		.content{
+			.item{
+				display: flex;
+				margin-bottom: 34rpx;
+				border-bottom: 1px dashed;
+				.option{
+					padding-left: 20rpx;
+				}
+				.picture{
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 8rpx;
+					overflow: hidden;
+					img{
+						width: 100rpx;
+						height: 100%;
+						
+					}
+				}
+				.infosQuery{
+					width:400rpx !important;
+				}
+				.infos{
+					width:200rpx ;
+					margin-left: 16rpx;
+					.name{
+						color: rgba(51, 51, 51, 1);
+						font-size: 32rpx;
+						margin-bottom: 16rpx;
+					}
+					.model,.inventory{
+						color: rgba(153, 153, 153, 1);
+						font-size: 24rpx;
+						display: flex;
+						margin-bottom: 8rpx;
+					}
+					.infos-title{
+						width: 88rpx;
+						min-width: 88rpx;
+					}
+				}
+			}
+		}
+	}
+	
+	
+	}
+</style>

config/.env.dev.js

@@ -8,12 +8,12 @@ const UNI_APP = {
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 	PREFIX : "jp-Equipment-Jingli",
 	NODE_ENV :"dev",
-	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
+	SIMPLE_RUN:false,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	//openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	openId:"123456",//库管理
+	openId:"oBA__5UuQTRx5Q8h94bDPY-GO2SM",//zkx
+	//openId:"123456",//库管理
 	//openId:"123",// 项目部 - 审批1
 	//openId:"223",// 项目部 - 审批2
 	//openId:"323",// 项目部 - 审批3

pages.json

@@ -6,44 +6,26 @@
 			"style": {}
 		}
 
-		, {
-			"path": "pages/index/login",
-			"style": {
-				//navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}
-
-
 
 	],
 	"subPackages": [{
 			"root": "pages/projectDepartment",
-			"pages": [{
+			"pages": [ {
 					"path": "exportApplication/exportApplication",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
 
-
 				}, {
-					"path": "branch/exportApplication/exportApplication",
+					"path": "exportApplication/deliveriedList",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
 
 				}, {
-					"path": "branch/exportApplication/deliveriedList",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				}, {
-					"path": "branch/exportApplication/deliveryFrom",
+					"path": "exportApplication/deliveryFrom",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -51,7 +33,7 @@
 
 				},
 				{
-					"path": "branch/exportApplication/deliveryDetails",
+					"path": "exportApplication/deliveryDetails",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -59,7 +41,7 @@
 
 				},
 				{
-					"path": "branch/exportProcess/deliveryDetails",
+					"path": "exportProcess/deliveryDetails",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -67,7 +49,7 @@
 
 				},
 				{
-					"path": "branch/exportProcess/deliveryInfo",
+					"path": "exportProcess/deliveryInfo",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -75,7 +57,7 @@
 
 				},
 				{
-					"path": "branch/exportProcess/exportProcess",
+					"path": "exportProcess/exportProcess",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -83,7 +65,7 @@
 
 				},
 				{
-					"path": "branch/exportReturn/exportReturn",
+					"path": "exportReturn/exportReturn",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -91,7 +73,7 @@
 
 				},
 				{
-					"path": "branch/exportReturn/deliveryDetails",
+					"path": "exportReturn/deliveryDetails",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -99,7 +81,7 @@
 
 				},
 				{
-					"path": "branch/exportReturn/deliveryFrom",
+					"path": "exportReturn/deliveryFrom",
 					"style": {
 						//navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -107,14 +89,7 @@
 
 				}
 
-				, {
-					"path": "exportApplication/application",
-					"style": {
-						// "navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				}
+				
 			]
 		},
 		{

pages/index/index.vue

@@ -1,24 +1,453 @@
-<template>
-	<view>
-	index
-	<view @click="gotoUrl('pages/index/homePage')"> 出库</view>
+<template>
+	<view class="">
+		<view class="backgroundView">
+		
+		
+		<view class="background">
+
+		</view>
 	
-	</view>
-</template>
-
-<script>
+		<view class="logo">
+			<img src="../../assets/img/loginLogo@1x.png" alt="">
+		</view>
+		<view class="title">
+			荆力设备管理系统
+		</view>
+		
+
+		<view class="login">
+			<view class="login-box">
+				<!-- 登录身份 -->
+				<!-- <view class="identity">
+					<view class="icon">
+						<img src="../../assets/img/riFill-account-box-fill@1x.png" alt="">
+					</view>
+					<view class="tips">
+						请选择登录身份
+					</view>
+					<view class="unfold" @click="changeoptionShow()">
+						<u-icon name="arrow-down"></u-icon>
+
+					</view>
+					<view class="options" v-if="optionShow">
+						<view class="item">选项1</view>
+						<view class="item">选项2</view>
+						<view class="item">选项3</view>
+					</view>
+				</view> -->
+
+				<!-- 手机号 -->
+				<view class="tel">
+					<view class="icon">
+
+						<img src="../../assets/img/riFill-smartphone-fill@1x.png" alt="">
+					</view>
+					<view class="tips">
+						<!-- <view class="input">
+					</view> -->
+					<u-input class="telInput"   v-model="form.phone"  :placeholderStyle="{}" height="80"  input-align="left" type="number" placeholder="请填写手机号码" />
+					
+					<!-- <view class="verification-code" @click="getPhoneNumber2"	 >获取</view> -->
+			<!-- 		<button type="default" class="verification-code" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">获取手机号</button>
+ -->
+					</view>
+				</view>
+				<!-- 验证码 -->
+				<view class="pwd">
+					<view class="icon">
+						<img src="../../assets/img/riFill-message-3-fill Copy@1x.png" alt="">
+
+					</view>
+
+					<view class="tips">
+						<view class="input">
+							<u-input type="number"  v-model="form.code" 
+							:placeholderStyle="{}" height="80" input-align="left" placeholder="请填写验证码" />
+						</view>
+						<view class="verification-code"  @click="getCode"  >{{codeTips}}</view>
+						<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start">
+						</u-verification-code>
+					</view>
+				</view>
+			
+			<view class="login-btn">
+				<u-button type="primary" @click="finish()" >登录</u-button>
+			</view>
+			</view>
+		
+
+		</view>
 	
-	
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-	}
-</script>
-
-
-<style  lang="scss" scoped>
+		</view>
+	</view>
+</template>
+
+<script>
 	
+	import * as API from '@/apis/pagejs/index.js'
+	import {
+		checkPhone
+	} from '@/apis/utils'
+	export default {
+		data() {
+			return {
+				form: {
+					name: '',
+					phone: '',
+					code: '',
+				},
+				codeTips: '',
+				isSendMsgIng: false,
+				sendMsgSecond: 60 * 2,
+				optionShow: false
+			}
+		},
+		onLoad(){
+			var openId= this.carhelp.getOpenId();
+			if(openId){
+				this.getInfo()
+			}
+		},
+		methods: {
+			
+			getPhoneNumber(e){
+				    console.log(e)
+
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.findByOpenId({
+					openId: this.carhelp.getOpenId(),
+				}).then((res) => {
+					
+					this.carhelp.setPersonInfo(res.data.regUser );
+					this.carhelp.setToken(res.data.token);
+					this.carhelp.setPersonInfoPlus(res.data);
+					
+					uni.redirectTo({
+						url:"/pages/otherFunctions/homePage"
+					})
+				}).catch(error => {
+					uni.hideLoading();
+					
+					//this.getPhone()
+					
+				})
+			},
+			codeChange(text) {
+				this.codeTips = text;
+			},
+			//倒计时
+					
+			end() {
+				this.sendMsgSecond = 2 * 60;
+				this.isSendMsgIng = false;
+			},
+			finish() {
+					
+				if (!this.carhelp.getOpenId()) {
+					// uni.showToast({
+					// 	title: "请使用“微信”访问本系统登录"
+					// })
+					// return
+				}
+				if (!this.form.phone) {
+					uni.showToast({
+						title: "请输入手机号"
+					})
+					return
+				}
+				if (!this.form.code) {
+					uni.showToast({
+						title: "请输入验证码"
+					})
+					return
+				}
+					
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var headImg = "";
+				var userInfo = this.carhelp.get("xpgj_wx_user_info")
+				if (userInfo) {
+					
+					headImg = userInfo.headimgurl;
+				}
+					
+					
+				API.validateCode({
+					verifyCode: this.form.code,
+					telephone: this.form.phone,
+					openId: this.carhelp.getOpenId(),
+					headImg: headImg
+				}).then((response) => {
+					this.loginset(response)
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			loginset(response){
+				var token = response ? response.data.token : '';
+				this.carhelp.setToken(token);
+				this.carhelp.setPersonInfo(response.data.regUser);
+				this.carhelp.setPersonInfoPlus(response.data)
+				//this.gotoUrl("pages/user/index")
+				uni.redirectTo({
+					url:"/pages/otherFunctions/homePage"
+				})
+			},
+			start() {
+				if (!this.isSendMsgIng) {
+					
+					
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					API.getVerifyCode(this.form.phone).then((response) => {
+					
+					
+						uni.hideLoading();
+						this.carhelp.set("getvcodetime", new Date().getTime());
+					
+						if (!"") {
+							//倒计时
+							uni.showToast({
+								title: "发送成功"
+							})
+						} else {
+							uni.showToast({
+								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
+							})
+						}
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+					
+					
+				}
+			},
+			// 获取验证码
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {
+					
+				} else {
+					
+					uni.showToast({
+						title: '倒计时结束后再发送',
+						icon: "none"
+					})
+					return
+				}
+					
+				var checkPhoneResult = checkPhone(this.form.phone);
+					
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						title: checkPhoneResult,
+					
+					})
+					return;
+				}
+				this.$refs.uCode.start();
+			},
+			changeoptionShow() {
+				this.optionShow = !this.optionShow
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	 
+	page {
+		background-color: #fff;
+	}
+
+	uni-image {
+		width: 100%;
+		height: 512px;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+	}
+	.backgroundView{
+		
+		    background-image: url('http://rccs.oss-cn-hangzhou.aliyuncs.com/Jp-jingli/login.jpg');
+		    background-size: contain;
+	}
+	.background {
+		width: 100%;
+		height: 512px;
+		//background: linear-gradient(180deg, rgba(0, 45, 194, 1) 0%, rgba(0, 59, 254, 0.76) 49%, rgba(1, 122, 255, 0.5) 100%);
+		position: relative;
+		//z-index: 111;
+		opacity: 0.5;
+		padding-top: 300px;
+	}
+
+	.title {
+		font-family: 'Alibaba-PuHuiTi-Regular';
+		text-align: center;
+		color: rgba(255, 255, 255, 1);
+		font-size: 56rpx;
+		position: absolute;
+		top: 217px;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		opacity: 1;
+
+	}
+
+	.logo {
+		width: 144rpx;
+		height: 144rpx;
+		line-height: 144rpx;
+		border-radius: 12px;
+		background-color: rgba(255, 255, 255, 1);
+		text-align: center;
+		position: absolute;
+		top: 133px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+
+		img {
+			width: 90%;
+			height: 90%;
+			vertical-align: middle;
+		}
+	}
+
+	.login-box {
+		position: absolute;
+		border-radius: 24px 24px 0px 0px;
+		background-color: rgba(255, 255, 255, 1);
+		padding: 88rpx 96rpx;
+		top: 410px;
+		left: 0;
+		right: 0;
+		z-index: 999;
+
+		.tel {
+			/deep/.u-input {}
+		}
+
+		.pwd {
+			/deep/.u-input {}
+		}
+
+
+
+
+
+
+		.tel,
+		.pwd,
+		.identity {
+			width: 558rpx;
+			background-color: rgba(244, 245, 249, 1);
+			position: relative;
+			display: flex;
+			height: 80rpx;
+			line-height: 80rpx;
+			color: rgba(183, 172, 172, 1);
+			margin: auto;
+			margin-bottom: 36rpx;
+			border: 1px solid rgba(193, 204, 223, 1);
+			border-radius: 8px;
+
+			/deep/.u-input__input {
+				font-size: 32rpx;
+			}
+
+			.icon {
+				width: 14%;
+				text-align: center;
+				color: #B0B8C8;
+
+				img {
+					width: 32rpx;
+					height:32rpx;
+					vertical-align: middle;
+				}
+			}
+
+
+			.tips {
+
+				text-indent: 16rpx;
+				padding-right: 16rpx;
+				display: flex;
+				justify-content: space-between;
+
+				/deep/uni-input {
+					height: 80rpx !important;
+					line-height: 80rpx !important;
+					color: #A7ACB4;
+				}
+
+				.input {
+					width: 60%;
+				}
+			}
+
+
+		}
+
+		// 验证码
+		.verification-code {
+			color: #1F4A99;
+			line-height: 80rpx;
+			font-family: 'Alibaba-PuHuiTi-Regular';
+			color: rgba(0, 59, 254, 1);
+		}
+
+		.unfold {
+			margin-left: auto;
+			margin-right: 24rpx;
+		}
+
+		.options {
+
+			background-color: #fff;
+			z-index: 999;
+			position: absolute;
+			top: 80rpx;
+			left: 40px;
+			right: 4rpx;
+			box-shadow: 0px 2px 4px #A7ACB4;
+			color: #101010;
+
+			.item {
+				padding-left: 16rpx;
+				line-height: 72rpx;
+			}
+		}
+		.login-btn{
+			margin-top: 80rpx;
+			/deep/uni-button{
+				border-radius: 8px;
+				background-color: rgba(0, 59, 254, 1);
+				color: #fff;
+				height: 88rpx;
+				line-height: 88rpx;
+			}
+		}
+		
+	}
 </style>

pages/index/login.vue

@@ -1,261 +0,0 @@
-<template>
-	<view>
-		<view class="background">
-
-		</view>
-		<view class="logo">
-			<img src="../../assets/img/loginLogo@1x.png" alt="">
-		</view>
-		<view class="title">
-			荆力设备管理系统
-		</view>
-		<image src="../../assets/img/login.png" mode="">
-		</image>
-
-		<view class="login">
-			<view class="login-box">
-				<!-- 登录身份 -->
-				<view class="identity">
-					<view class="icon">
-						<img src="../../assets/img/riFill-account-box-fill@1x.png" alt="">
-					</view>
-					<view class="tips">
-						请选择登录身份
-					</view>
-					<view class="unfold" @click="changeoptionShow()">
-						<u-icon name="arrow-down"></u-icon>
-
-					</view>
-					<view class="options" v-if="optionShow">
-						<view class="item">选项1</view>
-						<view class="item">选项2</view>
-						<view class="item">选项3</view>
-					</view>
-				</view>
-
-				<!-- 手机号 -->
-				<view class="tel">
-					<view class="icon">
-
-						<img src="../../assets/img/riFill-smartphone-fill@1x.png" alt="">
-					</view>
-					<view class="tips">
-						<u-input class="telInput" type="number" placeholder="请填写手机号码" />
-					</view>
-				</view>
-				<!-- 验证码 -->
-				<view class="pwd">
-					<view class="icon">
-						<img src="../../assets/img/riFill-message-3-fill Copy@1x.png" alt="">
-
-					</view>
-
-					<view class="tips">
-						<view class="input">
-							<u-input type="number" placeholder="请填写验证码" />
-						</view>
-						<view class="verification-code">获取验证码</view>
-
-					</view>
-				</view>
-			
-			<view class="login-btn">
-				<button>登录</button>
-			</view>
-			</view>
-		
-
-		</view>
-	
-	
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				optionShow: false
-			}
-		},
-		methods: {
-			changeoptionShow() {
-				this.optionShow = !this.optionShow
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background-color: #fff;
-	}
-
-	uni-image {
-		width: 100%;
-		height: 512px;
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-	}
-
-	.background {
-		width: 100%;
-		height: 512px;
-		background: linear-gradient(180deg, rgba(0, 45, 194, 1) 0%, rgba(0, 59, 254, 0.76) 49%, rgba(1, 122, 255, 0.5) 100%);
-		position: relative;
-		z-index: 111;
-		opacity: 0.5;
-		padding-top: 300px;
-	}
-
-	.title {
-		font-family: 'Alibaba-PuHuiTi-Regular';
-		text-align: center;
-		color: rgba(255, 255, 255, 1);
-		font-size: 56rpx;
-		position: absolute;
-		top: 217px;
-		left: 0;
-		right: 0;
-		z-index: 999;
-		opacity: 1;
-
-	}
-
-	.logo {
-		width: 144rpx;
-		height: 144rpx;
-		line-height: 144rpx;
-		border-radius: 12px;
-		background-color: rgba(255, 255, 255, 1);
-		text-align: center;
-		position: absolute;
-		top: 133px;
-		left: 0;
-		right: 0;
-		margin: auto;
-		z-index: 999;
-
-		img {
-			vertical-align: middle;
-		}
-	}
-
-	.login-box {
-		position: absolute;
-		border-radius: 24px 24px 0px 0px;
-		background-color: rgba(255, 255, 255, 1);
-		padding: 88rpx 96rpx;
-		top: 410px;
-		left: 0;
-		right: 0;
-		z-index: 999;
-
-		.tel {
-			/deep/.u-input {}
-		}
-
-		.pwd {
-			/deep/.u-input {}
-		}
-
-
-
-
-
-
-		.tel,
-		.pwd,
-		.identity {
-			width: 558rpx;
-			background-color: rgba(244, 245, 249, 1);
-			position: relative;
-			display: flex;
-			height: 80rpx;
-			line-height: 80rpx;
-			color: rgba(183, 172, 172, 1);
-			margin: auto;
-			margin-bottom: 36rpx;
-			border: 1px solid rgba(193, 204, 223, 1);
-			border-radius: 8px;
-
-			/deep/.u-input__input {
-				font-size: 32rpx;
-			}
-
-			.icon {
-				width: 14%;
-				text-align: center;
-				color: #B0B8C8;
-
-				img {
-					vertical-align: middle;
-				}
-			}
-
-
-			.tips {
-
-				text-indent: 16rpx;
-				padding-right: 16rpx;
-				display: flex;
-				justify-content: space-between;
-
-				/deep/uni-input {
-					height: 80rpx !important;
-					line-height: 80rpx !important;
-					color: #A7ACB4;
-				}
-
-				.input {
-					width: 60%;
-				}
-			}
-
-
-		}
-
-		// 验证码
-		.verification-code {
-			color: #1F4A99;
-			line-height: 80rpx;
-			font-family: 'Alibaba-PuHuiTi-Regular';
-			color: rgba(0, 59, 254, 1);
-		}
-
-		.unfold {
-			margin-left: auto;
-			margin-right: 24rpx;
-		}
-
-		.options {
-
-			background-color: #fff;
-			z-index: 999;
-			position: absolute;
-			top: 80rpx;
-			left: 40px;
-			right: 4rpx;
-			box-shadow: 0px 2px 4px #A7ACB4;
-			color: #101010;
-
-			.item {
-				padding-left: 16rpx;
-				line-height: 72rpx;
-			}
-		}
-		.login-btn{
-			margin-top: 80rpx;
-			uni-button{
-				border-radius: 8px;
-				background-color: rgba(0, 59, 254, 1);
-				color: #fff;
-				height: 88rpx;
-				line-height: 88rpx;
-			}
-		}
-		
-	}
-</style>

pages/otherFunctions/equipmentRetrieval/equipmentRetrieval.vue

@@ -1,306 +1,40 @@
 <template>
-	<view :class="{
-		iscomponents:iscomponents==1
-	}">
+	<view >
 		
-		<u-navbar title="出库申请" v-show="false" ref="navbar" ></u-navbar>
-		
-		<!-- 搜索 -->
-		<view class="search" v-if="iscomponents!=1" >
-			<u-icon name="arrow-left" @click="back()"  size="36"></u-icon>
-			<view class="search-box">
-				<u-search placeholder="搜索设备名称或型号" v-model="queryContent" :show-action="false">
-
-				</u-search>
-				<view class="search-btn" @click="form.pageIndex=1,getList()" >
-					<view class="text">
-						搜索
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="main">
-			<!-- 分类 -->
-			<view class="classify" v-if="!queryContentBl">
-				<view class="item " v-for="(item,index) in menuList" :key="index" @click="toggle(index)"
-					:class="{'checked':index ==checkindex }">
-					{{item.name}}<br/>
-				</view>
-				
-			</view>
-			<!-- 类型 -->
-			<view class="type" >
-			<view class="type-item">
-			<!-- 	<view class="title"  v-for="item in 4">
-					设备类型一
-				</view> -->
-				
-				<view class="content"  >
-					<view class="item" v-for="(item,i) in indexList"  @click="viewItem(item)" :key="i">
-						<view class="picture">
-							<img :src="item.imgUrl" alt="">
-						</view>
-						<view class="infos" :class="{
-							infosQuery:queryContentBl
-						}" >
-							<view class="name">
-								{{item.title}}
-							</view>
-							<view class="model">
-								<view class="infos-title">
-									型号：
-								</view>
-								<view class="value">
-									{{item.model}}
-								</view>
-							</view>
-							<view class="inventory">
-								<view class="infos-title">
-									库存：
-								</view>
-								<view class="value">
-									{{item.count}}
-								</view>
-							</view>
-							<view class="inventory"  v-if="queryContentBl">
-								<view class="infos-title">
-									分类：
-								</view>
-								<view class="value">
-									{{getMenuListName(item.typeId)}}
-								</view>
-							</view>
-						</view>
-						<view class="option" v-if="iscomponents==1" >
-							
-								<u-button v-if="deterItem(item)"  @click="ckItem(item)"
-								 style="height: 48rpx;"
-								 type="error" ><u-icon name="trash-fill"></u-icon>删除</u-button>
-								
-								<u-button v-else  @click="ckItem(item)"
-								 style="height: 48rpx;"
-								 type="primary" ><u-icon name="plus-circle"></u-icon>添加</u-button>
-								
-						</view>
-					</view>
-				</view>
-    </view>
-			</view>
-
-		</view>
+		<equipmentRetrieval  
+		 ref="equipmentRetrievalRef" :iscomponents="0"></equipmentRetrieval>
 
 	</view>
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/index.js'
+	//import * as API from '@/apis/pagejs/index.js'
+	import equipmentRetrieval from "@/components/equipmentRetrieval"
 	
 	export default {
-		props:{
-			iscomponents:{
-				default: ""
-			},
-			list:{
-				default: []
-			}
-		},
+		
 		data() {
 			return {
-				queryContent:"",
-				queryContentBl:false,
-				checkindex: 0,
-				indexList:[],
-				form:{
-					pageIndex:1,
-					pageSize:20,
-					list:[]
-				},
-				menuList: [
-					
-				]
+				
 
 			}
 		},
-		computed:{
-			listcurrentlist(){
-				var 	list=this.menuList[this.checkindex].list
-			
-				if(list){
-					return list
-				}else{
-					return  []
-				}
-				
-			}
+		components:{
+			equipmentRetrieval
 		},
 		mounted() {
 			
-			this.getDeviceTypeList();
+			//this.getDeviceTypeList();
 		},
 		onReady() {
 			//this.getList()
 		},
 		onReachBottom() {
-			this.myLoadmoreonReachBottom()
+		//	this.myLoadmoreonReachBottom()
 			
 		},
 		methods: {
-			myLoadmoreonReachBottom(){
-				var obj=this.menuList[this.checkindex]
-				if(this.queryContentBl){
-					obj=this.form;
-				}
-				console.log(obj)
-				if (this.indexList < obj.recordsTotal) {			
-					this.myLoadmore();
-				}
-			},
-			getMenuListName(id){
-				var obj =this.menuList.filter(item=>{
-					
-					return id==item.typeId;
-				})
-				if(obj.length){
-					return obj[0].name
-				}
-				
-			},
-			getDeviceTypeList(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.deviceTypeList({}).then((res) => {
-					
-					this.menuList = res.data.deviceTypeList.map(item=>{
-						return {
-							typeId:item.id,
-							name:item.name,
-							list:[],
-							pageIndex:1,
-							pageSize:10,
-							recordsTotal:0
-						}
-					});
-					uni.hideLoading();
-					if(this.menuList.length>0){
-						this.getList()
-					}
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			viewItem(item){
-				if(this.iscomponents==1){
-					
-				}else{
-					uni.navigateTo({
-						url:"./equipmentDetail?id="+item.id
-					})
-				}
-			},
-			deterItem(item){
-				var c=this.list.find(it=>{
-					
-					return it.obj.id==item.id
-				})
-				if(c){
-					return true
-				}else{
-					return false
-				}
-			},
-			ckItem(item){
-				this.$emit('ckItem',item)
-				
-			},
-			myLoadmore(){
-				if(this.queryContentBl){
-					this.form.pageIndex += 1;
-				}else{
-					this.menuList[this.checkindex].pageIndex += 1;
-					
-				}
-				this.getList();
-			},
-			getList(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				 this.datainit()
-				 var list=this.indexList
-				 var data = this.menuList[this.checkindex];
-				
-				 if(this.queryContent){
-					 //this.queryContentBl=true
-					// 删除类型  delete data.list;
-					data=this.form
-					data.queryContent=this.queryContent;
-					
-				 }else{
-					 
-					  //this.queryContentBl=false
-				 }
-				 delete data.list;
-				 
-				API.deviceList(data).then((res) => {
-					if(data.pageIndex==1){
-						list = res.data.data;
-					}else{
-						list = [
-							...list,
-							...res.data.data
-						];
-					}
-					if(this.queryContent){
-						this.queryContentBl=true
-						this.form.recordsTotal = res.data.recordsTotal;
-					}else{
-						this.queryContentBl=false
-						this.menuList[this.checkindex].list=list
-								
-						this.menuList[this.checkindex].recordsTotal = res.data.recordsTotal;
-					}
-					
-					this.indexList=list;
-					uni.hideLoading();
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			datainit(){
-				// var data = this.menuList[this.checkindex];
-				//  if(!data.pageIndex){
-				// 	  this.menuList[this.checkindex].pageIndex=1;
-				// 	 this.menuList[this.checkindex].pageSize=10
-				// 	 this.menuList[this.checkindex].recordsTotal=0;
-				// 	  this.menuList[this.checkindex].list=[]
-				//  }
-			},
-			toggle(index) {
-				this.checkindex = index
-				
-				this.datainit()
-				
-				var list=this.menuList[this.checkindex].list
-						
-				this.indexList=list;
-				if(list.length==0){
-					this.getList()
-				}
-				
-				
-			},
-			back(){
-				this.$refs.navbar.goBack()
-			}
+			
 			
 		},
 		

pages/otherFunctions/homePage.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="headerView">
 		<u-navbar title="首页"  v-show="false"></u-navbar>
 		
 		<!-- 头部 -->
@@ -21,13 +21,14 @@
 				
 					
 					<view class="qr-code">
-						<img src="@/assets/img/riLine-qr-scan-line@1x.png" alt="">
+						<!-- <img src="@/assets/img/riLine-qr-scan-line@1x.png" alt=""> -->
+						<u-icon name="scan" size="48" color="#fff"></u-icon>
 					</view>
 				</view>
 				
 			</view>
 			
-		</view>
+		 </view>
 		<!-- 宫格 -->
 		<view class="gird" >
 			<!-- 公告 -->
@@ -80,7 +81,7 @@
 		
 		<template v-if="userInfo.type=='2'">
 		
-			<view class="item"  @click="gotoUrl('pages/projectDepartment/branch/exportApplication/exportApplication')">
+			<view class="item"  @click="gotoUrl('pages/projectDepartment/exportApplication/exportApplication')">
 				<view class="title">
 					出库申请
 				</view>
@@ -91,7 +92,7 @@
 					<img src="@/assets/img/projectGird1.png" alt="">
 				</view>
 			</view>
-			<view class="item"  @click="gotoUrl('pages/projectDepartment/branch/exportProcess/exportProcess')">
+			<view class="item"  @click="gotoUrl('pages/projectDepartment/exportProcess/exportProcess')">
 				<view class="title">
 					出库审核
 				</view>
@@ -102,7 +103,7 @@
 					<img src="@/assets/img/projectGird2.png" alt="">
 				</view>
 			</view>
-			<view class="item"  @click="gotoUrl('pages/projectDepartment/branch/exportReturn/exportReturn')">
+			<view class="item"  @click="gotoUrl('pages/projectDepartment/exportReturn/exportReturn')">
 				<view class="title">
 					设备归还
 				</view>
@@ -114,7 +115,7 @@
 				</view>
 			</view>
 				</template>
-			<view class="item"  @click="gotoUrl('pages/index/equipmentRetrieval/equipmentRetrieval')">
+			<view class="item"  @click="gotoUrl('pages/otherFunctions/equipmentRetrieval/equipmentRetrieval')">
 				<view class="title">
 					设备检索
 				</view>
@@ -151,6 +152,7 @@
 				   <text>设备移交</text>
 				</view>
 		  	  </view>
+		 
 		  </view>
 	</view>
 </template>
@@ -234,7 +236,11 @@
 		//right: 24rpx;
 		box-shadow:5px 5px 10px gray;
 	}
-	
+	.headerView{
+		//background:linear-gradient(180deg, rgba(0,45,194,1) 0%,rgba(0,59,254,1) 49%,rgba(1,122,255,1) 100%);
+		background-color: rgba(1,122,255,1);
+		
+	}
 	page{
 		background-color: rgba(1,122,255,1);
 		padding-bottom: 100rpx;
@@ -251,8 +257,11 @@
 			background: url(@/assets/img/background.png) no-repeat;
 			background-position: top -70rpx right -50rpx;
 			position: relative;
+			background-position-y: 20px;
 		}
 		.title{
+			//margin-top: 60px;
+			 padding-top: 60px;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;

pages/projectDepartment/branch/exportApplication/exportApplication.vue

@@ -1,310 +0,0 @@
-<template>
-	<view>
-
-		<u-navbar title="出库申请" class="head">
-
-			<view class="tabs" slot="bottom">
-				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010" :list="list" :is-scroll="false"
-					:current="current" @change="change"></u-tabs>
-				<view class="screen" @click="changeShow()">
-					筛选<u-icon size="24" name="arrow-down" color="#777777"></u-icon>
-				</view>
-				<view class="options" v-if="this.show==true" @click="changeShow()">
-					选项3
-				</view>
-			</view>
-		</u-navbar>
-
-		<scroll-view scroll-y="true" @scrolltolower="onReachBottom()">
-			<view class="list1">
-				<view class="item" v-for="(item,i) in list[current].list" @click="ckInfo(item.id)" :key="i">
-					<view class="title">
-						<span v-if="current==1"
-							style="margin-right: 6px;"
-							:style="{color:recordStatusColor(item.status)}">[{{recordStatus(item.status)}}]</span>
-						{{item.projectName}}
-					</view>
-					<view class="group">
-						<view class="name">
-							申请人：
-						</view>
-						<view class="value">
-							{{item.createByName}}
-						</view>
-					</view>
-					<view class="group">
-						<view class="name">
-							申请时间：
-						</view>
-						<view class="value">
-							{{item.createTime}}
-						</view>
-					</view>
-
-				</view>
-				<u-divider  v-if="list[current].recordsTotal==list[current].list.length"
-				 :isnone="list[current].recordsTotal==0" nonetext="没有找到相关内容" 
-				border-color="#CFD2D5">已经到底了</u-divider>
-			</view>
-		
-			
-		</scroll-view>
-
-
-
-
-		<view class="bottom" @click="addInfo">
-			<button>填写出库申请</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/projectDepartment.js'
-
-	import {
-		recordStatus,
-		recordStatusColor
-	} from '@/apis/status.js'
-
-	export default {
-		data() {
-			return {
-
-				list: [{
-					name: '审批中',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "0",
-					list: []
-				}, {
-					name: '已审批',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "1",
-					list: []
-				}],
-				current: 0,
-				show: false
-			}
-		},
-
-		onReachBottom() {
-			var obj = this.list[this.current]
-			if (obj.list.length < obj.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		onReady() {
-			this.getList()
-		},
-		methods: {
-			recordStatus,
-			recordStatusColor,
-			getList() {
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var list = this.list[this.current].list
-				var obj = this.list[this.current]
-				var listForm = {
-					...obj
-				}
-				delete listForm.list
-
-				API.outApplyList(listForm).then((res) => {
-
-					if (listForm.pageIndex == 1) {
-						list = res.data.data;
-					} else {
-						list = [
-							...list,
-							...res.data.data
-						];
-					}
-
-					// list = [
-					// 	...list,
-					// 	...res.data.data
-					// ];
-					// list = [
-					// 	...list,
-					// 	...res.data.data
-					// ];
-					// list = [
-					// 	...list,
-					// 	...res.data.data
-					// ];
-					this.list[this.current].list = list
-
-					this.list[this.current].recordsTotal = res.data.recordsTotal;
-					uni.hideLoading();
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-
-			},
-			myLoadmore() {
-				this.list[this.current].pageIndex += 1;
-				this.getList();
-			},
-			init() {
-				this.current = 0
-				this.list[0].pageIndex = 1
-				this.list[1].pageIndex = 1
-				this.getList()
-			},
-			ckInfo(id) {
-				var url = "./deliveryDetails?id=" + id;
-				uni.navigateTo({
-					url: url,
-					events: {
-						refreshData: () => {
-							this.init()
-						}
-					}
-				})
-			},
-			addInfo() {
-				var url = "./deliveryFrom";
-				uni.navigateTo({
-					url: url,
-					events: {
-						refreshData: () => {
-							this.init()
-						}
-					}
-				})
-			},
-			change(index) {
-				this.current = index;
-				var list = this.list[this.current].list
-				if (list.length == 0) {
-					this.getList();
-				}
-
-			},
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		padding-bottom: 100rpx;
-
-	}
-
-	.head {
-		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
-
-		/deep/.u-navbar {
-			//background: 0!important;
-			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
-			height: 95px;
-			//padding: 0 32rpx;
-		}
-
-		/deep/.u-border-bottom:after {
-			height: 0;
-		}
-
-		.tabs {
-			padding: 0 32rpx
-		}
-	}
-
-	.tabs {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		/deep/.u-tabs {
-			background: 0 !important;
-			width: 250rpx;
-		}
-
-		/deep/.u-tab-bar {
-			background-color: #2A8EFB !important;
-		}
-
-		.screen {
-			color: #415058;
-			position: relative;
-			font-family: Microsoft Yahei;
-
-			/deep/.uicon-arrow-down {
-				margin-left: 4rpx;
-			}
-		}
-
-		.options {
-			width: 120rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			text-align: center;
-			background-color: #fff;
-			color: rgba(65, 80, 88, 1);
-			font-family: Microsoft Yahei;
-			position: absolute;
-			top: 160rpx;
-			right: 24rpx;
-			box-shadow: 5px 5px 10px gray;
-		}
-
-	}
-
-
-	.list1,
-	.list2 {
-		padding: 0 32rpx;
-		margin-top: 60px;
-		margin-bottom: 10px;
-		.item {
-			border-radius: 8px;
-			background-color: rgba(255, 255, 255, 1);
-			padding: 32rpx;
-			margin-bottom: 24rpx;
-
-			.title {
-				color: rgba(51, 51, 51, 1);
-				font-size: 36rpx;
-				margin-bottom: 16rpx;
-			}
-
-			.group {
-				display: flex;
-				color: rgba(119, 119, 119, 1);
-				margin-top: 16rpx;
-				font-weight: bold;
-			}
-		}
-
-	}
-
-	.bottom {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: #fff;
-		padding: 16rpx 32rpx;
-
-		uni-button {
-			height: 88rpx;
-			line-height: 88rpx;
-			border-radius: 8px;
-			background: linear-gradient(180deg, rgba(22, 119, 255, 1) 0%, rgba(16, 98, 213, 1) 100%);
-			color: rgba(255, 255, 255, 1);
-			font-size: 32rpx;
-			font-family: Microsoft Yahei;
-		}
-	}
-</style>

pages/projectDepartment/exportApplication/application.vue

@@ -1,416 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="出库申请"></u-navbar>
-		<!--申请信息-->
-		<view class="application-group">
-			<view class="item">
-				<view class="title">
-					<text>*</text>所属项目
-				</view>
-				<view class="value">
-					<text>洪湖文泉110kV变电站二期</text>
-					<u-icon name="arrow-right" color="#C8C8C8"></u-icon>
-				</view>
-			</view>
-
-			<view class="item">
-				<view class="title">
-					需求时间
-				</view>
-				<view class="value">
-					<text class="choose">请选择</text>
-					<u-icon name="arrow-right" color="#C8C8C8"></u-icon>
-				</view>
-			</view>
-
-			<view class="item">
-				<view class="title">
-					<text>*</text>使用周期至
-				</view>
-				<view class="value">
-					<text>2023年6月30日</text>
-					<u-icon name="arrow-right" color="#C8C8C8"></u-icon>
-				</view>
-			</view>
-
-
-		</view>
-		<!-- 清单 -->
-		<view class="list">
-			<view class="head">
-				<view class="title">
-					<text>*</text>出库设备清单
-				</view>
-				<view class="add">
-					<text><img src="../../../assets/img/riLine-file-add-line@1x(1).png" alt=""></text>添加设备
-				</view>
-			</view>
-
-			<!-- 清单信息 -->
-			<view class="list-info">
-				<view class="info-head">
-					<view class="name">
-						汽油液压机
-					</view>
-					<view class="delete">
-						<img src="../../../assets/img/riLine-delete-bin-line@1x.png" alt="">
-					</view>
-				</view>
-				<view class="infos-content">
-					<view class="type">
-						规格型号：本田GX390
-					</view>
-					<view class="unit">
-						单位：台
-					</view>
-				</view>
-
-				<view class="quantity">
-					<view class="title">
-						出库数量
-					</view>
-					<view class="value">
-						<u-number-box :max="10" v-model="value" @change="valChange"></u-number-box>
-					</view>
-				</view>
-
-			</view>
-
-		</view>
-		<!-- 弹出层 -->
-		<u-popup v-model="popupShow" mode="bottom">
-			<view class="popup-box">
-				<view class="title">
-					添加设备
-
-					<u-icon name="close" @click="changePopupShow()"></u-icon>
-				</view>
-				<!-- 搜索 -->
-				<view class="search">
-
-					<view class="search-box">
-						<u-search placeholder="搜索设备名称或编号" :show-action="false">
-
-						</u-search>
-						<view class="search-btn">
-							<view class="text">
-								搜索
-							</view>
-						</view>
-					</view>
-				</view>
-			 <!-- 设备信息-->
-			 <view class="equipment-infos">
-				 <view class="item" v-for="item in 5">
-				 <view class="photo">
-				 	<img src="../../../assets/img/equipmentPic.png" alt="">
-				 </view>
-				 <view class="infos">
-				 	<view class="name">
-				 		安防摄像头
-				 	</view>
-					<view class="type">
-						型号：DAH08410512
-					</view>
-					<view class="inventory">
-						库存：10
-					</view>
-				 </view>
-			 	<view class="add" click="changePopupShow">
-			 		<text><img src="../../../assets/img/riLine-file-add-line@1x.png" alt=""></text>添加设备
-			 	</view>
-			 </view>
-			 </view>
-			
-			</view>
-		</u-popup>
-		<!-- 提交 -->
-		<view class="bottom" >
-			<button @click="changePopupShow()" >提交出库单</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				value: 0,
-				popupShow: false,
-			}
-		},
-		methods: {
-			valChange(e) {
-				console.log('当前值为: ' + e.value)
-			},
-			changePopupShow(){
-				this.popupShow=!this.popupShow;
-				
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	page {
-		padding-bottom: 100px;
-	}
-
-	// 申请信息
-	.application-group {
-		background-color: #fff;
-
-		.item {
-			display: flex;
-			justify-content: space-between;
-			line-height: 88rpx;
-			padding: 0 32rpx;
-			color: #101010;
-
-			.title {
-				text {
-					color: #F44444;
-				}
-			}
-
-			.value {
-				/deep/.u-icon--right {
-					margin-left: 8rpx;
-				}
-
-				.choose {
-					color: #CCCCCC;
-				}
-			}
-		}
-	}
-
-	// 清单
-	.list {
-		background-color: #fff;
-		padding: 24rpx 32rpx;
-		margin-top: 24rpx;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-
-
-			.title {
-				color: rgba(51, 51, 51, 1);
-
-				text {
-					color: rgba(244, 68, 68, 1);
-				}
-			}
-
-			.add {
-				color: rgba(69, 186, 69, 1);
-
-				text {
-					vertical-align: middle;
-					margin-right: 8rpx;
-				}
-			}
-		}
-
-		// 清单信息
-		.list-info {
-			margin-top: 24rpx;
-			padding: 24rpx;
-			border-radius: 8px;
-			background-color: rgba(245, 246, 249, 1);
-
-			.info-head {
-				display: flex;
-				justify-content: space-between;
-			}
-
-			.infos-content {
-				margin-top: 16rpx;
-				display: flex;
-
-				.unit {
-					margin-left: 74rpx;
-				}
-			}
-		}
-
-		// 数量
-		.quantity {
-			border-top: 1px solid rgba(230, 230, 230, 1);
-			margin-top: 24rpx;
-			padding-top: 24rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			/deep/.u-icon-plus,
-			/deep/.u-icon-minus {
-				background-color: #fff !important;
-			}
-
-			/deep/.u-icon-disabled {
-				background-color: #F0F0F2 !important;
-			}
-		}
-	}
-
-	// 提交
-	.bottom {
-
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: #fff;
-		margin-top: 44rpx;
-		padding: 16rpx 32rpx;
-		z-index: 999;
-
-		uni-button {
-			border-radius: 7px;
-			background: linear-gradient(#3385FF, #3385FF);
-
-			color: rgba(255, 255, 255, 1);
-			font-size: 32rpx;
-			line-height: 80rpx;
-		}
-	}
-
-	// 弹出层
-	.popup-box {
-		background-color: #fff;
-		padding: 32rpx 32rpx 50rpx;
-		border-radius: 16px 16px 0px 0px;
-
-		.title {
-			color: rgba(16, 16, 16, 1);
-			font-size: 36rpx;
-			text-align: center;
-			position: relative;
-
-			/deep/.uicon-close {
-				position: absolute;
-
-				bottom: -4rpx;
-				right: 0;
-
-			}
-
-		}
-
-		// 搜索
-		.search {
-			padding: 12rpx 0;
-			display: flex;
-			border-radius: 8px;
-			overflow: hidden;
-			margin: 40rpx 0;
-         
-			.search-box {
-				display: flex;
-				border-radius: 8px;
-				overflow: hidden;
-			}
-
-			/deep/.u-search {
-				width: 586rpx;
-
-				margin: auto !important;
-				position: relative;
-				flex: 0;
-				margin: 0 !important;
-				height: 64rpx !important;
-			}
-
-			/deep/.u-content {
-				width: 686rpx;
-
-				border-radius: 0px !important;
-				height: 64rpx !important;
-			}
-
-			/deep/.u-icon--right {
-				margin-right: 16rpx;
-			}
-
-			.search-btn {
-				width: 100rpx;
-				height: 64rpx;
-				background-color: #f2f2f2;
-
-				.text {
-					height: 40rpx;
-					margin: 12rpx 0;
-					border-left: 1px solid #999999;
-					font-family: Microsoft Yahei;
-					text-align: center;
-					color: rgba(16, 98, 213, 1);
-					font-size: 28rpx;
-				}
-			}
-		}
-	  // 设备信息
-	  .equipment-infos{
-		  .item{
-			  display: flex;
-			  align-items: center;
-			  padding-bottom: 24rpx;
-			  margin-bottom: 24rpx;
-			  border-bottom: 1px solid rgba(232, 232, 232, 1);
-		  }
-		  
-		  .photo{
-			  width: 120rpx;
-			  height: 120rpx;
-			  border-radius: 4px;
-			  overflow: hidden;
-			  img{
-				  width: 100%;
-				  height: 100%;
-			  }
-		  }
-		  .infos{
-			  margin-left: 16rpx;
-			  .name{
-				  color: rgba(51, 51, 51, 1);
-				  font-size: 32rpx;
-				  font-family: 'Alibaba-PuHuiTi-Regular';
-				  margin-bottom: 12rpx;
-			  }
-			  .type,.inventory{
-				  color: rgba(153, 153, 153, 1);
-				  font-size: 24rpx;
-				  margin-bottom: 8rpx;
-			  }
-		  }
-		  .add{
-			  margin-left: auto;
-			  display: flex;
-			  align-items: center;
-			  padding:16rpx 8rpx;
-			  color: #fff;
-			  border-radius: 4px;
-			  background: linear-gradient(180deg, rgba(22,119,255,1) 0%,rgba(16,98,213,1) 100%);
-			  text-align: center;
-			  font-size: 24rpx;
-			  text{
-				  display: inline-block;
-				  width: 32rpx;
-				  height: 32rpx;
-				  // vertical-align: middle;
-				  margin-right: 8rpx;
-				  img{
-					  width: 100%;
-					  height: 100%;
-				  }
-			  }
-			  
-		  }
-	  }
-	
-	
-	
-	}
-</style>

pages/projectDepartment/branch/exportApplication/deliveryDetails.vue → pages/projectDepartment/exportApplication/deliveryDetails.vue

@@ -63,7 +63,7 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount" @click="gotoUrl('pages/projectDepartment/branch/exportApplication/deliveriedList?id='+id)">
+				<view class="amount" @click="gotoUrl('pages/projectDepartment/exportApplication/deliveriedList?id='+id)">
 					全部 <text>{{recordsTotal}}</text> 件设备
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -149,8 +149,16 @@
 		data() {
 			return {
 				id:"",
-				info:{},
-				outUser:{},
+				info:{
+					projectName:"",
+					startTime:"",
+					endTime:"",
+					createTime:"",
+				},
+				outUser:{
+					name:"",
+					headImg:""
+				},
 				outRecordDetailObj:{},
 				outRecordDeviceList:[],
 				approveList:[],

pages/projectDepartment/branch/exportApplication/deliveryFrom.vue → pages/projectDepartment/exportApplication/deliveryFrom.vue

@@ -44,9 +44,10 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount add" @click="showpopup=true">
+				<view class="amount add"  @click="showpopupBtn()" >
 					
-					<u-icon name="plus-circle"></u-icon>添加设备
+						<u-icon name="plus-circle"></u-icon>添加设备
+				
 				</view>
 			</view>
 			<!-- 清单信息 -->
@@ -180,14 +181,16 @@
 				</scroll-view>
 	 		</u-popup>
 	<!-- 确认出库 -->
-	<view class="bottom" @click="submit()" >
-		<button>提交出库单</button>
+	<view class="bottom"  >
+		
+		<u-button type="primary"  @click="submit">提交出库单</u-button>
+		
 	</view>
 	</view>
 </template>
 
 <script>
-	import equipmentRetrieval from "@/pages/otherFunctions/equipmentRetrieval/equipmentRetrieval"
+	import equipmentRetrieval from "@/components/equipmentRetrieval"
 	import * as API from '@/apis/pagejs/projectDepartment.js'
 	
 	export default {
@@ -217,6 +220,14 @@
 			 
 		},
 		methods:{
+			showpopupBtn(){
+				console.log(123)
+				uni.showToast({
+					title:"123"
+				})
+				this.showpopup=true
+			},
+			
 			refscrolltolower(){
 				this.$refs.equipmentRetrievalRef.myLoadmoreonReachBottom()
 			},

pages/projectDepartment/exportApplication/exportApplication.vue

@@ -1,200 +1,310 @@
-<template>
-	<view>
-		<u-navbar title="出库申请" class="head">
-		
-			<view class="tabs" slot="bottom">
-				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010" :list="list" :is-scroll="false"
-					:current="current" @change="change"></u-tabs>
-				<view class="screen" @click="changeShow()">
-					筛选<u-icon size="24" name="arrow-down" color="#777777"></u-icon>
-				</view>
-				<view class="options" v-if="this.show==true" @click="changeShow()">
-					选项3
-				</view>
-			</view>
-		</u-navbar>
-		
-		<scroll-view scroll-y="true" @scrolltolower="onReachBottom()">
-		
-		
-		
-		<view class="list1" v-if="this.current==0">
-			<view class="item" v-for="item in 2">
-				<view class="title">
-					刘群的出库申请
-				</view>
-				<view class="group">
-					<view class="name">
-						申请人：
-					</view>
-					<view class="value">
-						刘群
-					</view>
-				</view>
-				<view class="group">
-					<view class="name">
-						申请时间：
-					</view>
-					<view class="value">
-					2023/03/15 16:15
-					</view>
+<template>
+	<view>
+
+		<u-navbar title="出库申请" class="head">
+
+			<view class="tabs" slot="bottom">
+				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010" :list="list" :is-scroll="false"
+					:current="current" @change="change"></u-tabs>
+				<view class="screen" @click="changeShow()">
+					筛选<u-icon size="24" name="arrow-down" color="#777777"></u-icon>
+				</view>
+				<view class="options" v-if="this.show==true" @click="changeShow()">
+					选项3
+				</view>
+			</view>
+		</u-navbar>
+
+		<scroll-view scroll-y="true" @scrolltolower="onReachBottom()">
+			<view class="list1">
+				<view class="item" v-for="(item,i) in list[current].list" @click="ckInfo(item.id)" :key="i">
+					<view class="title">
+						<span v-if="current==1"
+							style="margin-right: 6px;"
+							:style="{color:recordStatusColor(item.status)}">[{{recordStatus(item.status)}}]</span>
+						{{item.projectName}}
+					</view>
+					<view class="group">
+						<view class="name">
+							申请人：
+						</view>
+						<view class="value">
+							{{item.createByName}}
+						</view>
+					</view>
+					<view class="group">
+						<view class="name">
+							申请时间：
+						</view>
+						<view class="value">
+							{{item.createTime}}
+						</view>
+					</view>
+
 				</view>
-				
+				<u-divider  v-if="list[current].recordsTotal==list[current].list.length"
+				 :isnone="list[current].recordsTotal==0" nonetext="没有找到相关内容" 
+				border-color="#CFD2D5">已经到底了</u-divider>
 			</view>
-		</view>
-		<view class="list2" v-if="this.current==1" > 
-			<view class="item" v-for="item in 2">
-				<view class="title">
-					刘群的出库申请2
-				</view>
-				<view class="group">
-					<view class="name">
-						申请人：
-					</view>
-					<view class="value">
-						刘群
-					</view>
-				</view>
-				<view class="group">
-					<view class="name">
-						申请时间：
-					</view>
-					<view class="value">
-					2023/03/15 16:15
-					</view>
-				</view>
-				
-			</view>
-		</view>
-		
-		<u-divider  v-if="recordsTotal==noticeList.length"
-		 :isnone="recordsTotalList==0" nonetext="没有找到相关内容" 
-		border-color="#CFD2D5">已经到底了</u-divider>
-		
-		</scroll-view>
-		
-		
-		<view class="bottom">
-			<button>填写出库申请</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list: [{
-					name: '未审批'
-				}, {
-					name: '已审批'
-				}	
-				],
-				current: 0,
-				show:false
-			}
-		},
-		methods: {
-			change(index) {
-				this.current = index;
-			},
-			changeShow(){
-				this.show=!this.show
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		padding-bottom: 100rpx;
-		
-	}
-	.head{
-		background: linear-gradient(180deg, rgba(190,211,240,1) 0%,rgba(244,244,246,1) 100%) ;
-		height: 590rpx;
-		padding: 0 32rpx;
-		/deep/.u-navbar{
-			background: 0!important;
-		}
-		/deep/.u-border-bottom:after{
-			height: 0;
-		}
-	}
-	.tabs{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		/deep/.u-tabs{
-			background: 0 !important;
-			width: 250rpx;
-		}
-		/deep/.u-tab-bar{
-			background-color: #2A8EFB !important;
-		}
-		.screen{
-			color: #415058;
-			position: relative;
-			font-family: Microsoft Yahei;
-			/deep/.uicon-arrow-down{
-				margin-left: 4rpx;
-			}
-		}
-		.options{
-			width: 120rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			text-align: center;
-			background-color: #fff;
-			color: rgba(65, 80, 88, 1);
-			font-family: Microsoft Yahei;
-			position: absolute;
-			top: 160rpx;
-			right: 24rpx;
-			box-shadow:5px 5px 10px gray;
-		}
 		
-	}
-
-
- .list1,.list2{
-	 padding: 0 32rpx;
-		margin-top: 60px;margin-bottom: 10px;
-	 .item{
-		 border-radius: 8px;
-		 background-color: rgba(255, 255, 255, 1);
-		 padding: 32rpx;
-		 margin-bottom: 24rpx;
-		 .title{
-			 color: rgba(51, 51, 51, 1);
-			 font-size: 36rpx;
-			 margin-bottom: 16rpx;
-		 }
-		 .group{
-			 display: flex;
-			 color: rgba(119, 119, 119, 1);
-			 margin-top: 16rpx;
-			 font-weight: bold;
-		 }
-	 }
-	 
- }
-
-.bottom{
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	background-color: #fff;
-	padding: 16rpx 32rpx;
-	uni-button{
-		height: 88rpx;
-		line-height: 88rpx;
-		border-radius: 8px;
-		background: linear-gradient(180deg, rgba(22,119,255,1) 0%,rgba(16,98,213,1) 100%);
-		color: rgba(255, 255, 255, 1);
-		font-size: 32rpx;
-		font-family: Microsoft Yahei;
-	}
-}
-</style>
+			
+		</scroll-view>
+
+
+
+
+		<view class="bottom">
+			<u-button type="primary"  @click="addInfo">填写出库申请</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/projectDepartment.js'
+
+	import {
+		recordStatus,
+		recordStatusColor
+	} from '@/apis/status.js'
+
+	export default {
+		data() {
+			return {
+
+				list: [{
+					name: '审批中',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "0",
+					list: []
+				}, {
+					name: '已审批',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "1",
+					list: []
+				}],
+				current: 0,
+				show: false
+			}
+		},
+
+		onReachBottom() {
+			var obj = this.list[this.current]
+			if (obj.list.length < obj.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		onReady() {
+			this.getList()
+		},
+		methods: {
+			recordStatus,
+			recordStatusColor,
+			getList() {
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list = this.list[this.current].list
+				var obj = this.list[this.current]
+				var listForm = {
+					...obj
+				}
+				delete listForm.list
+
+				API.outApplyList(listForm).then((res) => {
+
+					if (listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+
+					// list = [
+					// 	...list,
+					// 	...res.data.data
+					// ];
+					// list = [
+					// 	...list,
+					// 	...res.data.data
+					// ];
+					// list = [
+					// 	...list,
+					// 	...res.data.data
+					// ];
+					this.list[this.current].list = list
+
+					this.list[this.current].recordsTotal = res.data.recordsTotal;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+
+			},
+			myLoadmore() {
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			init() {
+				this.current = 0
+				this.list[0].pageIndex = 1
+				this.list[1].pageIndex = 1
+				this.getList()
+			},
+			ckInfo(id) {
+				var url = "./deliveryDetails?id=" + id;
+				uni.navigateTo({
+					url: url,
+					events: {
+						refreshData: () => {
+							this.init()
+						}
+					}
+				})
+			},
+			addInfo() {
+				var url = "./deliveryFrom";
+				uni.navigateTo({
+					url: url,
+					events: {
+						refreshData: () => {
+							this.init()
+						}
+					}
+				})
+			},
+			change(index) {
+				this.current = index;
+				var list = this.list[this.current].list
+				if (list.length == 0) {
+					this.getList();
+				}
+
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		padding-bottom: 100rpx;
+		
+	}
+
+	.head {
+		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
+
+		/deep/.u-navbar {
+			//background: 0!important;
+			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
+			height: 210rpx;
+			//padding: 0 32rpx;
+		}
+
+		/deep/.u-border-bottom:after {
+			height: 0;
+		}
+
+		.tabs {
+			padding: 0 32rpx
+		}
+	}
+
+	.tabs {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		/deep/.u-tabs {
+			background: 0 !important;
+			width: 250rpx;
+		}
+
+		/deep/.u-tab-bar {
+			background-color: #2A8EFB !important;
+		}
+
+		.screen {
+			color: #415058;
+			position: relative;
+			font-family: Microsoft Yahei;
+
+			/deep/.uicon-arrow-down {
+				margin-left: 4rpx;
+			}
+		}
+
+		.options {
+			width: 120rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			background-color: #fff;
+			color: rgba(65, 80, 88, 1);
+			font-family: Microsoft Yahei;
+			position: absolute;
+			top: 160rpx;
+			right: 24rpx;
+			box-shadow: 5px 5px 10px gray;
+		}
+
+	}
+
+
+	.list1,
+	.list2 {
+		padding: 0 32rpx;
+		margin-top: 60px;
+		margin-bottom: 10px;
+		.item {
+			border-radius: 8px;
+			background-color: rgba(255, 255, 255, 1);
+			padding: 32rpx;
+			margin-bottom: 24rpx;
+
+			.title {
+				color: rgba(51, 51, 51, 1);
+				font-size: 36rpx;
+				margin-bottom: 16rpx;
+			}
+
+			.group {
+				display: flex;
+				color: rgba(119, 119, 119, 1);
+				margin-top: 16rpx;
+				font-weight: bold;
+			}
+		}
+
+	}
+
+	.bottom {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #fff;
+		padding: 16rpx 32rpx;
+
+		uni-button {
+			height: 88rpx;
+			line-height: 88rpx;
+			border-radius: 8px;
+			background: linear-gradient(180deg, rgba(22, 119, 255, 1) 0%, rgba(16, 98, 213, 1) 100%);
+			color: rgba(255, 255, 255, 1);
+			font-size: 32rpx;
+			font-family: Microsoft Yahei;
+		}
+	}
+</style>

pages/projectDepartment/branch/exportProcess/deliveryDetails.vue → pages/projectDepartment/exportProcess/deliveryDetails.vue

@@ -61,7 +61,7 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount" @click="gotoUrl('pages/projectDepartment/branch/exportApplication/deliveriedList?id='+id)">
+				<view class="amount" @click="gotoUrl('pages/projectDepartment/exportApplication/deliveriedList?id='+id)">
 					全部 <text>{{recordsTotal}}</text> 件设备
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -154,8 +154,16 @@
 				isSpPerson:false,
 				id:"",
 				outRecordDetailObj:{},
-				info:{},
-				outUser:{},
+				info:{
+					projectName:"",
+					startTime:"",
+					endTime:"",
+					createTime:"",
+				},
+				outUser:{
+					name:"",
+					headImg:""
+				},
 				outRecordDeviceList:[],
 				approveList:[],
 				recordsTotal:0,
@@ -236,9 +244,24 @@
 					
 					const eventChannel = this.getOpenerEventChannel();
 					eventChannel.emit('refreshData');
-					uni.showToast({
-						title:"操作成功"
+					// uni.showToast({
+					// 	title:"操作成功"
+					// })
+					
+					uni.showModal({
+						title:"提示",
+						content:"操作成功",
+						showCancel:false,
+						success(resc) {
+							
+							if(resc.confirm){
+								
+							}else{
+								
+							}
+						}
 					})
+					
 					uni.showLoading({
 						title: "加载中",
 						mask: true,
@@ -525,6 +548,7 @@
 	// }
 	// 确认出库
 	.bottom{
+		    text-align: center;
 		background-color: #fff;
 		margin-top: 44rpx;
 		padding: 16rpx 32rpx;

pages/projectDepartment/branch/exportProcess/deliveryInfo.vue → pages/projectDepartment/exportProcess/deliveryInfo.vue

@@ -61,7 +61,7 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount" @click="gotoUrl('pages/projectDepartment/branch/exportApplication/deliveriedList?id='+id)">
+				<view class="amount" @click="gotoUrl('pages/projectDepartment/exportApplication/deliveriedList?id='+id)">
 					全部 <text>{{recordsTotal}}</text> 件设备
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -141,8 +141,16 @@
 		data() {
 			return {
 				id:"",
-				info:{},
-				outUser:{},
+				info:{
+					projectName:"",
+					startTime:"",
+					endTime:"",
+					createTime:"",
+				},
+				outUser:{
+					name:"",
+					headImg:""
+				},
 				outRecordDetailObj:{},
 				outRecordDeviceList:[],
 				approveList:[],

pages/projectDepartment/branch/exportProcess/exportProcess.vue → pages/projectDepartment/exportProcess/exportProcess.vue

@@ -181,7 +181,7 @@
 		/deep/.u-navbar {
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
-			height: 95px;
+			height: 210rpx;
 			//padding: 0 32rpx;
 		}
 	

pages/projectDepartment/branch/exportReturn/deliveryDetails.vue → pages/projectDepartment/exportReturn/deliveryDetails.vue

@@ -109,9 +109,7 @@
 		
     </view>
 	<!-- 确认出库 -->
-	<view class="bottom" v-if="false" >
-		<button>确认出库</button>
-	</view>
+	 
 	</view>
 </template>
 
@@ -125,9 +123,15 @@
 		data() {
 			return {
 				id:"",
-				info:{},
+				info:{
+					projectName:"",
+					startTime:"",
+					endTime:"",
+					createTime:"",
+				},
 				outUser:{
-					userImg:""
+					name:"",
+					headImg:""
 				},
 				deviceInfoList:{},
 			}

pages/projectDepartment/branch/exportReturn/exportReturn.vue → pages/projectDepartment/exportReturn/exportReturn.vue

@@ -44,8 +44,10 @@
 		</view>
 		
 		</scroll-view>
-		<view class="bottom"  @click="addInfo">
-			<button>填写归还单</button>
+		<view class="bottom"  >
+		
+			<u-button type="primary"  @click="addInfo">填写归还单</u-button>
+			
 		</view>
 	</view>
 </template>
@@ -191,7 +193,7 @@
 		/deep/.u-navbar {
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
-			height: 95px;
+			height: 210rpx;
 			//padding: 0 32rpx;
 		}
 	

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -6,19 +6,79 @@
 					出库设备清单<text>({{recordsTotal}})</text>
 				</view>
 			</view>
-			<view slot="right" style="margin-right: 10px;">
-
-				<u-icon name="scan" size="48" @click="gotoscan('')"></u-icon>
-			</view>
-		</u-navbar>
+			
+		</u-navbar>
+		<u-popup  v-model="showpopup" class=""  mode="bottom" 
+	 border-radius="14"
+	 :closeable="true" >
+			<view class="scantitle">连续扫码{{deviceposition}}</view>
+			<view class="list">
+			<view class=" list-infos">
+				<view class="infos-head">
+					<view class="name">
+						{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
+					</view>
+				
+					<view class="name">
+						编号：{{nowscan.code}}
+					</view>
+				</view>
+				<view class="infos">
+					<view class="infos-1">
+						<view class="infos-item">
+							<view class="item-name">
+								厂家：
+							</view>
+							<view class="item-value">
+								{{nowscan.manufactor}}
+							</view>
+						</view>
+						<view class="infos-item">
+							<view class="item-name">
+								单位：
+							</view>
+							<view class="item-value">
+								{{nowscan.unit}}
+							</view>
+						</view>
+					</view>
+					<view class="infos-2">
+						<view class="infos-item">
+							<view class="item-name">
+								规格：
+							</view>
+							<view class="item-value">
+								{{nowscan.specifications}}
+							</view>
+						</view>
+						<view class="infos-item">
+							<view class="item-name">
+								型号：
+							</view>
+							<view class="item-value">
+								{{nowscan.model}}
+							</view>
+						</view>
+					</view>
+				
+				</view>
+				</view>
+			</view>
+			<camera mode="scanCode"   resolution='medium' 
+			 @scancode="takeCode"  v-if="showpopup"
+			 device-position="back" flash="off" @error="error"
+			 style="width: 100%; height: 300px;"></camera>
+			
+		</u-popup>
 		<view class="list" v-for="(item,index) in list" :key="index">
 			<!-- 清单信息 -->
 			<view class="list-infos">
 				<view class="infos-head">
 					<view class="name">
 						{{item.deviceName}}
-					</view>
-					<view class="qr-code" @click="gotoscan(item.deviceName)">
+					</view>
+
+					<view class="qr-code" v-if="status==1" @click="gotoscan(item.deviceName)">
 						<text><u-icon name="scan" color="#fff"></u-icon>
 						</text>
 						<text>扫码出库</text>
@@ -151,7 +211,9 @@
 						</view>
 					</view>
 				</view>
-				<textarea placeholder="备注" name="" id="" v-model="item.remark" cols="30" rows="1"></textarea>
+				<textarea  class="textarea"
+				
+				placeholder="备注" name="" id="" v-model="item.remark" cols="30" rows="1"></textarea>
 			</view>
 
 		</view>
@@ -211,7 +273,7 @@
 		</view>
 
 		<!-- 确认出库 -->
-		<view class="bottom">
+		<view class="bottom" v-if="status==1">
 			<u-button type="primary" @click="gotoOut()">确认出库</u-button>
 
 		</view>
@@ -226,7 +288,21 @@
 	} from '@/apis/status.js'
 	export default {
 		data() {
-			return {
+			return {
+				nowscan:{
+				"title": "",
+				"specifications": "",
+				
+				"manufactor": "",
+				"unit": "",
+				"model": "",
+				"code": "",
+			
+			},
+			status:"",
+			deviceposition:"front",
+			scanFunctionIsUseable:true,
+				showpopup:false,
 				show: false,
 				list: [],
 				scanList: [],
@@ -246,7 +322,8 @@
 			}
 		},
 		onLoad(op) {
-			this.id = op.id
+			this.id = op.id
+			this.status = op.status
 			this.getList()
 		},
 		onReady() {
@@ -311,7 +388,8 @@
 						}).join()
 						list.push({
 							"remark":item.remark?item.remark:"",
-							"deviceIds":maplistStr
+							"deviceIds":maplistStr,
+							"recordDeviceId":item.id
 						})
 					}
 					
@@ -331,7 +409,7 @@
 					recordData: JSON.stringify(obj),
 				
 				}).then((res) => {
-				
+					this.status=3;
 					const eventChannel = this.getOpenerEventChannel();
 					  eventChannel.emit('refreshData');
 					  uni.hideLoading()
@@ -354,9 +432,55 @@
 						icon: "none"
 					})
 				})
-			},
-			gotoscan(val) {
-				console.log('111')
+			},
+			 error(e) {
+			            console.log(e.detail);
+			 },
+			 gotoscan(val){
+				// if(this.deviceposition=='back'){
+				// 	this.deviceposition="front"
+				// }else{
+				// 	this.deviceposition="back"
+				// }
+				 
+				 // #ifdef H5
+				 	this.gotoscanH5(val)
+				 // #endif
+				 
+				 // #ifdef MP-WEIXIN
+				 	
+				 		this.gotoscanMP(val)
+				 // #endif
+				 
+			 },
+			 takeCode(e){
+				 console.log(e);
+				  if(this.scanFunctionIsUseable) {
+				         this.scanFunctionIsUseable = false;
+				         // 对扫码结果进行处理
+				         console.log(e.detail.result);
+						this.getscan(e.detail.result)
+				         // 扫码间隔两秒
+				         setTimeout(() => {
+				         this.scanFunctionIsUseable = true;
+						
+				         }, 1000)
+				     }
+				
+			 },
+			 gotoscanMP(val){
+				 this.showpopup=true;
+				  // const ctx = uni.createCameraContext();
+				  //            ctx.takePhoto({
+				  //                quality: 'high',
+				  //                success: (res) => {
+				  //                    this.src = res.tempImagePath
+				  //                }
+				  //            });
+			 },
+			gotoscanH5(val) {
+				console.log('111')
+				
 				var _this = this;
 				uni.showModal({
 					title: '提示',
@@ -400,7 +524,17 @@
 					}
 				});
 			},
-			getscan(val) {
+			getscan(val) {
+				 this.showpopup=true;
+				var c = this.scanList.find(item => {
+					return item.code == val
+				})
+				if (c) {
+					
+					return
+				}
+				
+				
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -411,7 +545,7 @@
 					uni.hideLoading();
 					if (res.data.deviceInfo) {
 						console.log(res.data.deviceInfo)
-
+						this.nowscan=res.data.deviceInfo;
 						var c = this.scanList.find(item => {
 							return item.id == res.data.deviceInfo.id
 						})
@@ -535,7 +669,11 @@
 			}
 		}
 	}
-
+	.scantitle{
+		text-align: center;
+		font-size: 44rpx;
+		 padding-top: 20px;
+	}
 	.list {
 		background-color: #fff;
 		margin: 24rpx;
@@ -655,7 +793,7 @@
 		}
 
 		// 备注
-		uni-textarea {
+		.textarea {
 			width: 100%;
 			height: 80rpx;
 			line-height: 80rpx;

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -125,7 +125,7 @@
     </view>
 		<!-- 确认出库 -->
 		<view class="bottom" v-if="info.status=='1'" >
-			<u-button  type="primary"  @click="gotoOut()" >确认出库</u-button>
+			<u-button  type="primary"  @click="gotoOut()" >前往出库</u-button>
 			
 		</view>
 	</view>
@@ -145,8 +145,16 @@
 		data() {
 			return {
 				id:"",
-				info:{},
-				outUser:{},
+				info:{
+					projectName:"",
+					startTime:"",
+					endTime:"",
+					createTime:"",
+				},
+				outUser:{
+					name:"",
+					headImg:""
+				},
 				outRecordDetailObj:{},
 				outRecordDeviceList:[],
 				approveList:[],
@@ -178,7 +186,7 @@
 			},
 			gotoOut(){
 				uni.navigateTo({
-					url:'/pages/storeManagement/equipmentDelivery/deliveriedList?id='+this.id,
+					url:'/pages/storeManagement/equipmentDelivery/deliveriedList?id='+this.id+"&status="+this.info.status,
 					events: {
 						refreshData: () => {
 							this.init()

pages/storeManagement/equipmentDelivery/equipmentDelivery.vue

@@ -5,7 +5,7 @@
 			<view class="tabs" slot="bottom">
 				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010" :list="list" :is-scroll="false"
 					:current="current" @change="change"></u-tabs>
-			
+					
 			</view>
 		</u-navbar>
 		
@@ -166,7 +166,7 @@
 		/deep/.u-navbar {
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
-			height: 95px;
+			height: 210rpx;
 			//padding: 0 32rpx;
 		}
 	
@@ -179,9 +179,14 @@
 		}
 	}
 	.tabs{
-		width: 250rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+		
 		/deep/.u-tabs{
 			background: 0 !important;
+			width: 250rpx;
 		}
 		/deep/.u-tab-bar{
 			background-color: #2A8EFB !important;

pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -108,10 +108,7 @@
 		</view>
 		
     </view>
-	<!-- 确认出库 -->
-	<view class="bottom" v-if="false" >
-		<button>确认出库</button>
-	</view>
+	
 	</view>
 </template>
 
@@ -125,9 +122,15 @@
 		data() {
 			return {
 				id:"",
-				info:{},
+				info:{
+					projectName:"",
+					startTime:"",
+					endTime:"",
+					createTime:"",
+				},
 				outUser:{
-					userImg:""
+					name:"",
+					headImg:""
 				},
 				deviceInfoList:{},
 			}

pages/storeManagement/equipmentEnter/equipmentEnter.vue

@@ -166,7 +166,7 @@
 		/deep/.u-navbar {
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
-			height: 95px;
+			height: 210rpx;
 			//padding: 0 32rpx;
 		}
 	

pages/storeManagement/equipmentEnter/returnList.vue

@@ -127,8 +127,9 @@
 				</view>
 			</view>
 		</view>
+		
 		<view class="bottom">
-			<button>保存</button>
+			<u-button type="primary"  @click="submit">保存</u-button>
 		</view>
 	</view>
 </template>
@@ -152,6 +153,9 @@
 			};
 		},
 		methods: {
+			submit(){
+				
+			},
 			// 选中某个单选框时，由radio时触发
 			radioChange(e) {
 				// console.log(e);

pages/storeManagement/equipmentEnter/verification.vue

@@ -165,7 +165,7 @@
 							</view>
 							<view class="u-order-time">
 								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
+									
 								</view>
 								<view class="confirm">
 									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
@@ -203,7 +203,7 @@
 							</view>
 							<view class="u-order-time">
 								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
+									
 								</view>
 								<view class="confirm">
 									<img src="@/assets/img/riFill-gradienter-fill@1x.png" alt="">
@@ -219,10 +219,10 @@
 		</view>
 		</view>
     <!-- 确认出库 -->
-	<view class="bottom" >
-		<button>确认入库</button>
-	</view>
 	
+		<view class="bottom">
+			<u-button type="primary"  @click="submit()">确认入库</u-button>
+		</view>
 	</view>
 </template>
 
@@ -231,8 +231,13 @@
 		data() {
 			return {
 
+			}
+		},methods:{
+			submit(){
+				
 			}
 		}
+		
 	}
 </script>
 

pages/storeManagement/equipmentInspection/inspectionRecord.vue

@@ -95,7 +95,8 @@
         <!-- 图片 -->
 		<view class="image">
 			<view class="img-box" >
-				<img src="@/assets/img/image.png" alt="">
+				<!-- src="@/assets/img/image.png"-->
+				<img  alt="">
 			</view>
 		</view>
 

uni_modules/uview-ui/components/u-divider/u-divider.vue

@@ -1,11 +1,13 @@
 <template>
 	<view>
-		<view  class="carNone"  v-show="isnone" >
-			<img src="@/assets/img/暂无数据-缺省页.png" alt="">
-			<p v-text="nonetext" ></p>
+		<view  class="carNone"  v-if="isnone" >
+			<!-- <img src="@/assets/img/暂无数据-缺省页.png" alt=""> -->
+			<u-empty style=" margin-top: 40px;" :text="nonetext" mode="search"></u-empty>
+
+			<!-- <p v-text="nonetext" ></p> -->
 		</view>	
 	
-		<view class="u-divider" v-show="!isnone" :style="{
+		<view class="u-divider" v-else :style="{
 			height: height == 'auto' ? 'auto' : height + 'rpx',
 			backgroundColor: bgColor,
 			marginBottom: marginBottom + 'rpx',

uni_modules/uview-ui/components/u-navbar/u-navbar.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="">
+	<view class="" style="">
 		<view class="u-navbar" :style="[navbarStyle]" :class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
 			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
 			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
@@ -138,7 +138,7 @@
 				type: Object,
 				default () {
 					return {
-						background: '#ffffff'
+						background: 'linear-gradient(180deg, #bed3f0 0%, #f4f4f6 100%)'
 					}
 				}
 			},