修改海运费筛选不方便

common/http.interceptor.js

@@ -3,13 +3,13 @@
 const install = (Vue, vm) => {
 	let baseURL;
 	if (process.env.NODE_ENV === 'development') {
-		baseURL = "https://test.wms.tubaosoft.com/prod-api"
+		// baseURL = "https://test.wms.tubaosoft.com/prod-api"
 		// baseURL = "https://zd.tubaosoft.com/prod-api"
 		// baseURL = "http://192.168.1.116:9011"
 		// baseURL = "https://ap.tubaosoft.com/prod-api"
 		// baseURL = "https://dmu.tubaosoft.com/prod-api"
 		// baseURL = "https://jingang.tubaosoft.com/prod-api"
-		// baseURL = "https://jiyong.tubaosoft.com/prod-api"
+		baseURL = "https://jiyong.tubaosoft.com/prod-api"
 	}
 	if (process.env.NODE_ENV === 'production') {
 		// baseURL = "https://zd.tubaosoft.com/prod-api"

manifest.json

@@ -2,8 +2,8 @@
     "name" : "TuBaoSoft",
     "appid" : "__UNI__38FA993",
     "description" : "",
-    "versionName" : "1.0.26",
-    "versionCode" : 26,
+    "versionName" : "1.0.30",
+    "versionCode" : 30,
     "transformPx" : false,
     "app-plus" : {
         // APP-VUE分包，可提APP升启动速度，2.7.12开始支持，兼容微信小程序分包方案，默认关闭

pages.json

@@ -45,7 +45,12 @@
 		{
 			"path": "pages/home/ceshi",
 			"style": {
-				"navigationBarTitleText": "ceshi"
+				"navigationBarTitleText": "天眼",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 				// "navigationBarTextStyle": "black"
 			}
 		},
@@ -194,7 +199,8 @@
 			    "style" :                                                                                    
 			    {
 			        "navigationBarTitleText": "船期查询",
-			        "enablePullDownRefresh": false,
+			        "enablePullDownRefresh": false,
+					"titleNView": false,
 					"navigationBarTextStyle": "white"
 			    }
 			    
@@ -226,7 +232,7 @@
 			    "path" : "/patrolInspection/index",
 			    "style" :                                                                                    
 			    {
-			        "navigationBarTitleText": "巡检",
+			        "navigationBarTitleText": "我的巡检",
 			        "enablePullDownRefresh": false,
 					"navigationBarTextStyle": "white"
 			    }
@@ -292,7 +298,29 @@
 			    "path" : "/inventoryQuery/index",
 			    "style" :                                                                                    
 			    {
-			        "navigationBarTitleText": "库存",
+			        "navigationBarTitleText": "我的库存",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
+			//库存明细
+			{
+			    "path" : "/inventoryQuery/inventoryDetails",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "库存明细",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
+			//附件明细
+			{
+			    "path" : "/inventoryQuery/detailedAttachment",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "附件明细",
 			        "enablePullDownRefresh": false,
 					"navigationBarTextStyle": "white"
 			    }

pages/home/ceshi.vue

@@ -4,7 +4,10 @@
 		<video id="preview" style=" width: 100%;" autoplay="autoplay" :src="url"></video>
 	</view> -->
 	<view>
-		<iframe :src="url" width="100%" height="400" id="cameraTest" allowfullscreen/>
+		<iframe :src="url" width="100%" height="400" style="background-color: #000000;" id="cameraTest" allowfullscreen />
+		<view style="width: 100%;text-align: center;">
+			<h1>仓库门口</h1>
+		</view>
 	</view>
 </template>
 
@@ -17,8 +20,8 @@
 				access_token: ''
 			}
 		},
-		onLoad(option) {
-			this.url = ""
+		onLoad(option) {
+			// this.url = ""
 			uni.request({
 				url: 'https://open.hikyun.com/artemis/oauth/token/v2',
 				method: 'POST',
@@ -27,16 +30,31 @@
 					secretKey: "ctZiCTxLpKLdSKjjKkWa",
 					productCode: "1636609606025604",
 					projectId: "1321376925660208"
-				},
+				},
 				success: (res) => {
-					console.log(res.data.data);
 					this.access_token = res.data.data.access_token
-					// this.url = "https://open.ys7.com/ezopen/h5/iframe?url=ezopen://open.ys7.com/" +
-						// 'G71540859' + "/" + '1' + ".hd.live&accessToken=" + this.access_token + "&templete=1"
-					console.log(this.url)
+					uni.request({
+						url: 'https://open.hikyun.com/artemis/api/eits/v1/global/live/video/preview',
+						method: 'POST',
+						header: {
+							"access_token": res.data.data.access_token,
+						},
+						data: {
+							"toolBar": 0,
+							"deviceSerial": "G26011245",
+							"channelNo": 1,
+							"videoLevel": 1,
+							"audio": 1,
+							"autoPlay": 1,
+							"projectId": 1321376925660208
+						},
+						success: (res) => {
+							console.log(res)
+							this.url = res.data.data.previewUrl
+						}
+					});
 				}
 			});
-
 			// this.url = 'rtmp://ns8.indexforce.com/home/mystream'
 			// this.getUrl(option.id);
 			// uni.setNavigationBarTitle({

pages/home/delivery/detailed.vue

@@ -36,7 +36,7 @@
 				<view>{{item.corpName}}</view>
 			</view>
 			<view class="basic">
-				<view>入库日期</view>
+				<view>出库日期</view>
 				<view>{{item.fBsdate}}</view>
 			</view>
 			<view class="basic">

pages/home/delivery/index.vue

@@ -28,7 +28,7 @@
 				<view>{{item.corpName}}</view>
 			</view>
 			<view class="basic">
-				<view>入库日期/仓库</view>
+				<view>出库日期/仓库</view>
 				<view>{{item.fBsdate}}/{{item.fWarehouseName}}</view>
 			</view>
 			<view class="basic">

pages/home/freightCalculation/shipSchedule.vue

@@ -4,18 +4,29 @@
 		<!-- 搜索区 -->
 		<view style="width: 80%;margin: 10rpx auto;">
 			<!-- <u-field v-model="polId" label="起始港" placeholder="请选择起始港" type="select" @click="destination = true"></u-field> -->
-
+			<u-navbar title="船期查询" :background="{ background: '#1669e6' }" title-color="#fff" back-icon-color="#fff"></u-navbar>
 			<u-form-item label="起始港" label-width="100rpx">
-				<u-input v-model="list.polId" type="select" placeholder="请选择起始港" @click="destination = true" />
+				<u-input v-model="list.polId" type="select" placeholder="请选择起始港" @click="popup(0)" />
 			</u-form-item>
-			<u-action-sheet :list="destinationList" v-model="destination" @click="destinationMethod"></u-action-sheet>
+			<u-popup v-model="destination" width="100%">
+				<u-navbar :custom-back="portSelection">
+					<u-search placeholder="请输入港口" v-model="formPort.fName" @search="searchPort" @custom="searchPort">
+					</u-search>
+				</u-navbar>
+				<u-cell-group>
+					<u-cell-item v-for="(item,index) in portList" :key="index" :title="item.fName" @click="confirmSelection(item)"></u-cell-item>
+				</u-cell-group>
+				<!-- <u-loadmore :status="status" :load-text="loadText" /> -->
+			</u-popup>
+			<!-- <u-action-sheet :list="destinationList" v-model="destination" @click="destinationMethod"></u-action-sheet> -->
 			<u-form-item label="目的港" label-width="100rpx">
-				<u-input v-model="list.podId" type="select" placeholder="请选择目的港" @click="destinationtwo = true" />
+				<u-input v-model="list.podId" type="select" placeholder="请选择目的港" @click="popup(1)" />
 			</u-form-item>
 			<u-action-sheet :list="destinationList" v-model="destinationtwo" @click="destinationMethodTwo">
 			</u-action-sheet>
 			<u-form-item label="开航日" label-width="100rpx">
-				<u-input v-model="list.sailingDay" :disabled="true" type="select" placeholder="请选择日期" @click="show = true" />
+				<u-input v-model="list.sailingDay" :disabled="true" type="select" placeholder="请选择日期"
+					@click="show = true" />
 			</u-form-item>
 			<u-calendar max-date="2050" v-model="show" mode="range" @change="change"></u-calendar>
 		</view>
@@ -52,14 +63,27 @@
 		data() {
 			return {
 				show: false,
-				mode: 'range',
-				list:{},
+				mode: 'range',
+				total: 0,
+				// 0为起运港1为目的港
+				portStatus: '',
+				status: 'nomore',
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '实在没有了'
+				},
+				list: {},
+				portList: [],
 				form: {
-					fQueryFrom: 'app',
-					pageNum: 1,
+					fQueryFrom: 'app',
+					pageNum: 1,
 					pageSize: 10,
 				},
 				destination: false,
+				formPort: {
+					pageNum: 1
+				},
 				destinationtwo: false,
 				destinationList: [],
 				historyList: []
@@ -68,7 +92,6 @@
 		created() {
 			this.destinationList = []
 			this.$u.get('/shipping/address/selectPortName').then(res => {
-				console.log(res)
 				for (let item in res.rows) {
 					this.destinationList.push({
 						value: res.rows[item].fId,
@@ -76,21 +99,64 @@
 					})
 				}
 			})
+			this.queryPort()
 			this.history()
 		},
+		// onReachBottom() {
+		// 	this.status = 'loading'
+		// 	if (this.portList.length < this.total) {
+		// 		this.formPort.pageNum++
+		// 		this.queryPort()
+		// 	} else {
+		// 		this.status = 'nomore'
+		// 	}
+		// },
 		methods: {
+			queryPort() {
+				console.log(this.formPort)
+				this.$u.get('/shipping/address/selectPortName', this.formPort).then(res => {
+					this.portList = this.portList.concat(res.rows)
+					this.total = res.total
+				})
+			},
 			//查询历史搜索记录
 			history() {
 				this.$u.get('/quotation/queryseapricelog/list').then(res => {
 					this.historyList = res.rows
 				})
 			},
-			change(e) {
+			change(e) {
 				console.log(e)
 				this.form.fValiddateBegin = e.startDate
 				this.form.fValiddateEnd = e.endDate
 				this.list.sailingDay = e.startDate + ' - ' + e.endDate
 			},
+			portSelection() {
+				this.destination = false
+			},
+			confirmSelection(item) {
+				this.destination = false
+				if (this.portStatus == 0) {
+					this.list.polId = item.fName
+					this.form.polId = item.fId
+				} else if (this.portStatus == 1) {
+					this.list.podId = item.fName
+					this.form.podId = item.fId
+				}
+			},
+			searchPort() {
+				this.formPort.pageNum = 1
+				this.queryPort()
+			},
+			popup(item) {
+				if (item == 0) {
+					this.portStatus = item
+					this.destination = true
+				} else if (item == 1) {
+					this.portStatus = item
+					this.destination = true
+				}
+			},
 			destinationMethod(index) {
 				this.list.polId = this.destinationList[index].text
 				this.form.polId = this.destinationList[index].value
@@ -102,21 +168,21 @@
 			submit() {
 				if (!this.form.polId) return this.textTips('请选择起始港')
 				if (!this.form.podId) return this.textTips('请选择目的港')
-				if (!this.form.fValiddateBegin || !this.form.fValiddateEnd) return this.textTips('请选择开航日期')
-				this.$u.route('/pages/home/freightCalculation/shippingInformation',{
-					form:JSON.stringify(this.form),
-					list:JSON.stringify(this.list)
+				if (!this.form.fValiddateBegin || !this.form.fValiddateEnd) return this.textTips('请选择开航日期')
+				this.$u.route('/pages/home/freightCalculation/shippingInformation', {
+					form: JSON.stringify(this.form),
+					list: JSON.stringify(this.list)
 				});
 				// this.$u.get('/warehouse/seaprice/query').then(res=>{
 				// 	console.log(res)
 				// })
-			},
-			textTips(text){
-				uni.showToast({
-					icon: 'none',
-					title: text,
-					position: "center"
-				})
+			},
+			textTips(text) {
+				uni.showToast({
+					icon: 'none',
+					title: text,
+					position: "center"
+				})
 			},
 			deleteRecord(id) {
 				console.log(id)

pages/home/home.vue

@@ -57,12 +57,12 @@
 					</u-grid-item>
 					<u-grid-item @click="jumpPath(7)">
 						<u-icon name="camera" :size="46"></u-icon>
-						<view class="grid-text">巡检照片</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(12)">
-						<u-icon name="grid" :size="46"></u-icon>
-						<view class="grid-text">测试</view>
+						<view class="grid-text">我的巡检</view>
 					</u-grid-item>
+					<!-- <u-grid-item @click="jumpPath(12)">
+						<u-icon name="eye-fill" :size="46"></u-icon>
+						<view class="grid-text">我的视频</view>
+					</u-grid-item> -->
 					<!-- <u-grid-item @click="jumpPath(8)">
 						<u-badge type="error" :count="total" />
 						<u-icon name="checkmark-circle" :size="46"></u-icon>
@@ -75,7 +75,7 @@
 				</u-grid>
 			</view>
 			<view style="width: 96%;margin: 0 auto;">
-				<u-image width="100%" height="170rpx" src="../../static/activityDiagram.png"></u-image>
+				<u-image width="100%" height="170rpx" src="../../static/activityDiagram1.png"></u-image>
 			</view>
 			<view style="width: 96%;margin: 10rpx auto;">
 				<u-image width="100%" height="900rpx" src="../../static/image/advertisingMap.png"></u-image>

pages/home/inventoryQuery/detailedAttachment.vue

@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<view class="ordertop">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">附件</text>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed'/>
+			</view>
+			<view class="basic" v-for="(item,index) in list" :key="index">
+				<view>{{item.fName}}</view>
+				<view>
+					<u-button type="primary" :ripple="true" ripple-bg-color="#909399" size="mini" 
+					@click="previewDocx(item.fUrl)">{{progress?'进度:'+progress:'查看'}}</u-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form: {},
+				progress:'',
+				list: []
+			}
+		},
+		onLoad(option) {
+			this.form = JSON.parse(option.item)
+			this.$u.get('/warehouseBusiness/enclosure/infoByPid', {
+				pId: 946
+			}).then(res => {
+				this.list = res.data
+			})
+		},
+		methods: {
+			//预览
+			previewDocx(item){
+				if(item == null){
+					uni.showToast({
+						icon: 'none',
+						title: '无附件',
+						position: "bottom"
+					})
+				}else{
+					uni.downloadFile({
+						url: item,
+						success: (res) => {
+							if (res.statusCode === 200) {
+								const downloadTask = uni.openDocument({
+									filePath: res.tempFilePath,
+									// 如果文件名包含中文，建议使用escape(res.tempFilePath)转码，防止ios和安卓客户端导致的差异
+									success: function(res) {
+										uni.showToast({
+											icon: 'none',
+											title: '打开附件成功',
+											position: "bottom"
+										})
+									},
+									fail:function(res){
+										uni.showToast({
+											icon: 'none',
+											title: '打开附件失败',
+											position: "bottom"
+										})
+									}
+								});
+								downloadTask.onProgressUpdate((res) => {
+									this.progress = res.progress
+								});
+							}
+						}
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.ordertop {
+		width: 96%;
+		background-color: #fff;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+		padding-top: 20rpx;
+		box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);
+		padding-bottom: 10rpx;
+	}
+	
+	.ordertop>view:nth-child(1) {
+		width: 98%;
+		margin-bottom: 60rpx;
+	}
+	.iconblue {
+		width: 10rpx;
+		height: 45rpx;
+		float: left;
+		background-color: #3a63cf;
+		margin-right: 10rpx;
+	}
+	.line {
+		width: 92%;
+		margin: 0 auto;
+	}
+	
+	.various {
+		float: right;
+		width: 150rpx;
+		border: 2rpx solid #3a63cf;
+		text-align: center;
+		border-radius: 100rpx;
+		color: #3a63cf;
+	}
+	.basic {
+		width: 94%;
+		margin: 10rpx auto;
+		display: flex;
+		justify-content: space-between;
+	}
+	
+	.basic>view {
+		margin-bottom: 10rpx;
+	}
+	
+	.basic>view:nth-child(1) {
+		color: #797979;
+	}
+</style>

pages/home/inventoryQuery/index.vue

@@ -1,184 +1,306 @@
-<template>
-	<view>
-		<!-- <view class="condition">
-			<view class="conditionone">
-				<view :style="{'border-bottom':(underline =='0'?'3rpx solid #fff':'none')}" @click="whole">全部</view>
-				<view :style="{'border-bottom':(underline =='1'?'3rpx solid #fff':'none')}" @click="show = !show,underline = '1'">仓库</view>
-				<view :style="{'border-bottom':(underline =='3'?'3rpx solid #fff':'none')}" @click="choiceState = !choiceState,underline = '3'">状态</view>
-			</view>
-		</view> -->
+<template>
+	<view>
+		<view class="condition">
+			<view class="conditionone">
+				<view :style="{'border-bottom':(underline =='0'?'3rpx solid #fff':'none')}" @click="screen(0)">全部</view>
+				<view :style="{'border-bottom':(underline =='1'?'3rpx solid #fff':'none')}" @click="screen(1)">仓库</view>
+				<view :style="{'border-bottom':(underline =='2'?'3rpx solid #fff':'none')}" @click="screen(2)">商品</view>
+				<view :style="{'border-bottom':(underline =='3'?'3rpx solid #fff':'none')}" @click="screen(3)">入库日期
+				</view>
+			</view>
+		</view>
 		<view class="search">
 			<u-search shape="round" placeholder="请输入提单号" @custom="custom" @search="custom" :clearabled="false">
 			</u-search>
-		</view>
-		<view class="ordertop" v-for="(item, index) in lisi" :key="index">
-			<view>
-				<view class="iconblue"></view>
-				<text class="license">提单号：{{item.fMblno}}</text>
-				<view class="various" @click="viewDetails(item)">{{item.fOriginalbilldate}}</view>
-			</view>
-			<view class="line">
-				<u-line color="#ccc" border-style='dashed' />
-			</view>
-			<view class="basic">
-				<view>货物属性</view>
-				<view>{{item.fBusinessTypes}}</view>
-			</view>
-			<view class="basic">
-				<view>品名</view>
-				<view>{{item.fGoodsids}}</view>
-			</view>
-			<view class="basic">
-				<view>仓库</view>
-				<view>{{item.fWarehouseids}}</view>
-			</view>
-			<view class="basic">
-				<view>结余件数</view>
-				<view>{{item.fQtyblc}}</view>
-			</view>
-			<view class="basic">
-				<view>结余毛重(kg)</view>
-				<view>{{item.fGrossweightblc}}</view>
-			</view>
-			<view class="basic">
-				<view>结余净重(kg)</view>
-				<view>{{item.fNetweightblc}}</view>
-			</view>
-			<view class="basic">
-				<view>箱号</view>
-				<view>{{item.fLocalcntrno}}</view>
-			</view>
-		</view>
-		<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
-	</view>
-</template>
-
-<script>
-	export default {
-		data(){
-			return{
-				underline:'0',
-				loadText: {
-					loadmore: '轻轻上拉',
-					loading: '努力加载中',
-					nomore: '实在没有了'
-				},
-				total:0,
-				iconType: 'flower',
-				status: 'loadmore',
-				form:{
-					pageNum: 1,
-					pageSize: 10
-				},
-				lisi:[]
-			}
-		},
-		created() {
-			this.query()
-		},
-		onReachBottom() {
-			this.status = 'loading'
-			if (this.lisi.length < this.total) {
-				this.form.pageNum++
-				this.query()
-			} else {
-				this.status = 'nomore'
-			}
-		},
-		methods:{
-			custom(text){
-				console.log(text)
-				this.form={
-					fMblno:text,
-					pageNum: 1,
-					pageSize: 10
-				}
-				this.query()
-			},
-			query(){
-				this.$u.get("/warehouseBusiness/whgenleg/appWhGenLegList",this.form).then(res=>{
-					console.log(res)
-					this.lisi = res.rows
-					this.total = res.total
-					if(this.total < 10) this.status = 'nomore'
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.ordertop {
-		width: 96%;
-		background-color: #fff;
-		margin: 20rpx auto;
-		border-radius: 20rpx;
-		padding-top: 20rpx;
-		box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);
-		padding-bottom: 10rpx;
-	}
-	
-	.ordertop>view:nth-child(1) {
-		width: 98%;
-		margin-bottom: 60rpx;
-	}
-	.iconblue {
-		width: 10rpx;
-		height: 45rpx;
-		float: left;
-		background-color: #3a63cf;
-		margin-right: 10rpx;
-	}
-	
-	.license {
-		float: left;
-		font-size: 32rpx;
-	}
-	
-	.various {
-		float: right;
-		width: 230rpx;
-		border: 2rpx solid #3a63cf;
-		text-align: center;
-		border-radius: 100rpx;
-		color: #1669e6;
-	}
-	.line {
-		width: 92%;
-		margin: 0 auto;
-	}
-	.basic {
-		width: 94%;
-		margin: 10rpx auto;
-		display: flex;
-		justify-content: space-between;
-	}
-	
-	.basic>view {
-		margin-bottom: 10rpx;
-	}
-	
-	.basic>view:nth-child(1) {
-		color: #797979;
-	}
-	.search {
-		width: 96%;
-		margin: 10rpx auto;
-	}
-	.condition {
-		background-color: #1669e6;
-		height: 60rpx;
-	}
-	.conditionone {
-		width: 92%;
-		height: 44rpx;
-		margin: 0rpx auto;
-		display: flex;
-		justify-content: space-between;
-		color: #fff;
-	}
-	
-	.conditionone>view {
-		color: #e6e8e8;
-	}
+		</view>
+		<view class="ordertop" v-for="(item, index) in lisi" :key="index">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">提单号：{{item.fMblno}}</text>
+				<view class="various" @click="viewDetails(item)">{{item.fOriginalbilldate}}</view>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>货物属性</view>
+				<view>{{item.fBusinessTypes}}</view>
+			</view>
+			<view class="basic">
+				<view>品名</view>
+				<view>{{item.fGoodsids}}</view>
+			</view>
+			<view class="basic">
+				<view>仓库</view>
+				<view>{{item.fWarehouseids}}</view>
+			</view>
+			<view class="basic">
+				<view>结余件数</view>
+				<view>{{item.fQtyblc}}</view>
+			</view>
+			<view class="basic">
+				<view>结余毛重(kg)</view>
+				<view>{{item.fGrossweightblc}}</view>
+			</view>
+			<view class="basic">
+				<view>结余净重(kg)</view>
+				<view>{{item.fNetweightblc}}</view>
+			</view>
+			<view class="basic">
+				<view>箱号</view>
+				<view>{{item.fLocalcntrno}}</view>
+			</view>
+			<view class="basic">
+				<view>入库时间</view>
+				<view>{{item.fOriginalbilldate}}</view>
+			</view>
+			<view class="basic">
+				<view>入库数</view>
+				<view>{{item.fQtyD}}</view>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="view" @click="viewDetails(item)">
+				<view>
+					<text>查看入出库照片</text>
+				</view>
+				<view>
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+		</view>
+		<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
+		<u-picker v-model="show" mode="selector" :range="list" range-key="fName" @confirm="confirm"></u-picker>
+		<u-calendar v-model="calendar" mode="range" @change="change"></u-calendar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				underline: '0',
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '实在没有了'
+				},
+				show: false,
+				calendar: false,
+				total: 0,
+				iconType: 'flower',
+				status: 'loadmore',
+				form: {
+					pageNum: 1,
+					pageSize: 10
+				},
+				lisi: [],
+				list: [],
+				warehouse: [],
+				commodity: []
+			}
+		},
+		created() {
+			this.query()
+			this.$u.get('/basicdata/warehouse/lists', {
+				fStatus: 0,
+				delFlag: 0
+			}).then(res => {
+				console.log(res)
+				this.warehouse = res.rows
+				// res.rows.forEach((item, index) => {
+				// 	this.warehouse.push({
+				// 		id: item.fId,
+				// 		text: item.fName
+				// 	})
+				// })
+			})
+			this.$u.get('/basicdata/goods/list', {
+				fStatus: 0,
+				delFlag: 0
+			}).then(res => {
+				console.log(res)
+				this.commodity = res.rows
+				// res.rows.forEach((item, index) => {
+				// 	this.commodity.push({
+				// 		id: item.fId,
+				// 		text: item.fName
+				// 	})
+				// })
+			})
+		},
+		onReachBottom() {
+			this.status = 'loading'
+			if (this.lisi.length < this.total) {
+				this.form.pageNum++
+				this.query()
+			} else {
+				this.status = 'nomore'
+			}
+		},
+		methods: {
+			//日期区间确定
+			change(e) {
+				console.log(e)
+				this.lisi = []
+				this.form = {
+					orgStorageDate: e.startDate + ' 00:00:00,' + e.endDate + ' 23:59:59',
+					pageNum: 1,
+					pageSize: 10
+				}
+				this.query()
+			},
+			//确定
+			confirm(index) {
+				this.lisi = []
+				console.log(index)
+				if (this.underline == 1) {
+					this.form = {
+						fWarehouseid: this.warehouse[index].fId,
+						pageNum: 1,
+						pageSize: 10
+					}
+				} else if (this.underline == 2) {
+					this.form = {
+						fGoodsid: this.commodity[index].fId,
+						pageNum: 1,
+						pageSize: 10
+					}
+				}
+				this.query()
+			},
+			//全部
+			screen(index) {
+				this.underline = index
+				if (index == 0) {
+					this.form = {
+						pageNum: 1,
+						pageSize: 10
+					}
+					this.query()
+				} else if (index == 1) {
+					this.show = true
+					this.list = this.warehouse
+				} else if (index == 2) {
+					this.show = true
+					this.list = this.commodity
+				} else if (index == 3) {
+					this.calendar = !this.calendar
+				}
+			},
+			custom(text) {
+				console.log(text)
+				this.form = {
+					fMblno: text,
+					pageNum: 1,
+					pageSize: 10
+				}
+				this.query()
+			},
+			viewDetails(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: './inventoryDetails?item=' + JSON.stringify(item)
+				});
+			},
+			query() {
+				this.$u.get('/warehouseBusiness/whgenleg/appWhGenLegList', this.form).then(res => {
+					console.log(res)
+					this.lisi = res.rows
+					this.total = res.total
+					if (this.total < 10) this.status = 'nomore'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.ordertop {
+		width: 96%;
+		background-color: #fff;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+		padding-top: 20rpx;
+		box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);
+		padding-bottom: 10rpx;
+	}
+
+	.ordertop>view:nth-child(1) {
+		width: 98%;
+		margin-bottom: 60rpx;
+	}
+
+	.iconblue {
+		width: 10rpx;
+		height: 45rpx;
+		float: left;
+		background-color: #3a63cf;
+		margin-right: 10rpx;
+	}
+
+	.license {
+		float: left;
+		font-size: 32rpx;
+	}
+
+	.various {
+		float: right;
+		width: 230rpx;
+		border: 2rpx solid #3a63cf;
+		text-align: center;
+		border-radius: 100rpx;
+		color: #1669e6;
+	}
+
+	.view {
+		width: 96%;
+		margin: 20rpx auto;
+		display: flex;
+		justify-content: space-between
+	}
+
+	.line {
+		width: 92%;
+		margin: 0 auto;
+	}
+
+	.basic {
+		width: 94%;
+		margin: 10rpx auto;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.basic>view {
+		margin-bottom: 10rpx;
+	}
+
+	.basic>view:nth-child(1) {
+		color: #797979;
+	}
+
+	.search {
+		width: 96%;
+		margin: 10rpx auto;
+	}
+
+	.condition {
+		background-color: #1669e6;
+		height: 60rpx;
+	}
+
+	.conditionone {
+		width: 92%;
+		height: 44rpx;
+		margin: 0rpx auto;
+		display: flex;
+		justify-content: space-between;
+		color: #fff;
+	}
+
+	.conditionone>view {
+		color: #e6e8e8;
+	}
 </style>

pages/home/inventoryQuery/inventoryDetails.vue

@@ -0,0 +1,158 @@
+<template>
+	<view>
+		<view class="ordertop" v-for="(item, index) in lisi" :key="index">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">提单号：{{item.fMblno}}</text>
+				<view class="various" @click="viewDetails(item)">{{item.billTypeName}}</view>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>业务日期</view>
+				<view>{{item.fBsdate}}</view>
+			</view>
+			<view class="basic">
+				<view>件数</view>
+				<view>{{item.fQty}}</view>
+			</view>
+			<view class="basic">
+				<view>毛重</view>
+				<view>{{item.fGrossweight}}</view>
+			</view>
+			<view class="basic">
+				<view>净重</view>
+				<view>{{item.fNetweight}}</view>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="view" @click="viewDetails(item)">
+				<view>
+					<text>查看详情</text>
+				</view>
+				<view>
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form: {},
+				lisi: []
+			}
+		},
+		onLoad(option) {
+			this.form = JSON.parse(option.item)
+			this.$u.get('/warehouse/app/whgenlegDetail', {
+				id: this.form.fId
+			}).then(res => {
+				console.log(res)
+				this.lisi = res.data
+			})
+		},
+		methods: {
+			viewDetails(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: './detailedAttachment?item=' + JSON.stringify(item)
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.ordertop {
+		width: 96%;
+		background-color: #fff;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+		padding-top: 20rpx;
+		box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);
+		padding-bottom: 10rpx;
+	}
+
+	.ordertop>view:nth-child(1) {
+		width: 98%;
+		margin-bottom: 60rpx;
+	}
+
+	.iconblue {
+		width: 10rpx;
+		height: 45rpx;
+		float: left;
+		background-color: #3a63cf;
+		margin-right: 10rpx;
+	}
+
+	.license {
+		float: left;
+		font-size: 32rpx;
+	}
+
+	.various {
+		float: right;
+		padding: 0 20rpx 0 20rpx;
+		border: 2rpx solid #3a63cf;
+		text-align: center;
+		border-radius: 100rpx;
+		color: #1669e6;
+	}
+
+	.view {
+		width: 96%;
+		margin: 20rpx auto;
+		display: flex;
+		justify-content: space-between
+	}
+
+	.line {
+		width: 92%;
+		margin: 0 auto;
+	}
+
+	.basic {
+		width: 94%;
+		margin: 10rpx auto;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.basic>view {
+		margin-bottom: 10rpx;
+	}
+
+	.basic>view:nth-child(1) {
+		color: #797979;
+	}
+
+	.search {
+		width: 96%;
+		margin: 10rpx auto;
+	}
+
+	.condition {
+		background-color: #1669e6;
+		height: 60rpx;
+	}
+
+	.conditionone {
+		width: 92%;
+		height: 44rpx;
+		margin: 0rpx auto;
+		display: flex;
+		justify-content: space-between;
+		color: #fff;
+	}
+
+	.conditionone>view {
+		color: #e6e8e8;
+	}
+</style>

pages/home/patrolInspection/index.vue

@@ -80,7 +80,7 @@
 		created() {
 			if(uni.getStorageSync('deptName') == '外部用户'){
 				this.list = [{
-					name: '仓库'
+					name: '选择仓库'
 				}]
 				delete this.form.fInspectionDatetime
 			}else{

pages/personalCenter/personalCenter.vue

@@ -18,9 +18,9 @@
 		</view>
 		<view class="u-m-t-20">
 			<u-cell-group>
-				<u-cell-item icon="star" title="我的积分"></u-cell-item>
+				<!-- <u-cell-item icon="star" title="我的积分"></u-cell-item> -->
 				<u-cell-item icon="photo" title="我的客服"></u-cell-item>
-				<u-cell-item icon="coupon" title="我的推广"></u-cell-item>
+				<!-- <u-cell-item icon="coupon" title="我的推广"></u-cell-item> -->
 				<u-cell-item icon="heart" title="我的待办"></u-cell-item>
 			</u-cell-group>
 		</view>
@@ -42,7 +42,7 @@
 				username:''
 			}
 		},
-		created() {
+		onShow() {
 			this.username = uni.getStorageSync('lifeData').vuex_user
 		},
 		methods: {