更新项目

common/http.interceptor.js

@@ -5,7 +5,7 @@ const install = (Vue, vm) => {
 	if (process.env.NODE_ENV === 'development') {
 		baseURL = "https://test.wms.tubaosoft.com/prod-api"
 		// baseURL = "https://zd.tubaosoft.com/prod-api"
-		// baseURL = "http://192.168.1.177:9010"
+		// 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"

manifest.json

@@ -2,8 +2,8 @@
     "name" : "TuBaoSoft",
     "appid" : "__UNI__38FA993",
     "description" : "",
-    "versionName" : "1.0.22",
-    "versionCode" : 22,
+    "versionName" : "1.0.26",
+    "versionCode" : 26,
     "transformPx" : false,
     "app-plus" : {
         // APP-VUE分包，可提APP升启动速度，2.7.12开始支持，兼容微信小程序分包方案，默认关闭
@@ -24,7 +24,9 @@
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
-        "modules" : {},
+        "modules" : {
+            "VideoPlayer" : {}
+        },
         "distribute" : {
             "android" : {
                 "permissions" : [
@@ -50,7 +52,8 @@
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "autoSdkPermissions" : true
             },
             "ios" : {},
             "sdkConfigs" : {
@@ -91,6 +94,22 @@
             "splashscreen" : {
                 "iosStyle" : "common"
             }
+        },
+        "nativePlugins" : {
+            "hk-preview" : {
+                "__plugin_info__" : {
+                    "name" : "海康视频实时预览插件",
+                    "description" : "海康摄像头录像机直连插件，实现设备视频预览和云台控制",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1981",
+                    "android_package_name" : "uni.UNI38FA993",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "1981",
+                    "parameters" : {}
+                }
+            }
         }
     },
     "quickapp" : {},

pages.json

@@ -41,6 +41,14 @@
 				// "navigationBarTextStyle": "black"
 			}
 		},
+		// 测试
+		{
+			"path": "pages/home/ceshi",
+			"style": {
+				"navigationBarTitleText": "ceshi"
+				// "navigationBarTextStyle": "black"
+			}
+		},
 		// 消息
 		{
 			"path": "pages/information/information",
@@ -235,6 +243,17 @@
 			    }
 			    
 			},
+			//统一审核页
+			{
+			    "path" : "/allReview/index",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "我的审核",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
 			//我的审核
 			{
 			    "path" : "/myReview/index",
@@ -267,6 +286,61 @@
 					"navigationBarTextStyle": "white"
 			    }
 			    
+			},
+			//库存查询
+			{
+			    "path" : "/inventoryQuery/index",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "库存",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
+			//调拨列表
+			{
+			    "path" : "/allocation/index",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "调拨列表",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
+			//调拨明细
+			{
+			    "path" : "/allocation/detailed",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "调拨明细",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
+			//货转列表
+			{
+			    "path" : "/goodsTransfer/index",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "货转列表",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
+			},
+			//货转明细
+			{
+			    "path" : "/goodsTransfer/index",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "货转明细",
+			        "enablePullDownRefresh": false,
+					"navigationBarTextStyle": "white"
+			    }
+			    
 			}
 		]
 	}],

pages/home/allReview/index.vue

@@ -0,0 +1,456 @@
+<template>
+	<view>
+		<view class="ordertop" v-if="type.refno4 == 'SJRK'">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">基础信息</text>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>客户</view>
+				<view>{{form.corpName}}</view>
+			</view>
+			<view class="basic">
+				<view>提单号</view>
+				<view>{{form.fMblno}}</view>
+			</view>
+			<view class="basic">
+				<view>计划日期</view>
+				<view>{{form.fMblno}}</view>
+			</view>
+			<view class="basic">
+				<view>入库时间</view>
+				<view>{{form.fBsdate}}</view>
+			</view>
+			<view class="basic">
+				<view>品名</view>
+				<view>{{form.goodsName}}</view>
+			</view>
+			<view class="basic">
+				<view>仓库</view>
+				<view>{{form.warehouseName}}</view>
+			</view>
+			<view class="basic">
+				<view>计划件数</view>
+				<view>{{form.fPlanqty}}</view>
+			</view>
+			<view class="basic">
+				<view>计划净重(kg)</view>
+				<view>{{form.fPlannetweight}}</view>
+			</view>
+			<view class="basic">
+				<view>计划毛重(kg)</view>
+				<view>{{form.fPlangrossweight}}</view>
+			</view>
+			<view class="basic">
+				<view>备注</view>
+				<view>{{form.remark}}</view>
+			</view>
+			<view class="basic" v-for="(item,index) in form.cntrsList" :key="index">
+				<view>箱型/箱量</view>
+				<view>{{form.fMblno}}{{form.fMblno}}</view>
+			</view>
+		</view>
+		<view class="ordertop" v-if="type.refno4 == 'SJCK'">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">基础信息</text>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>客户</view>
+				<view>{{form.corpName}}</view>
+			</view>
+			<view class="basic">
+				<view>结算方式</view>
+				<view>{{form.stltypeName}}</view>
+			</view>
+			<view class="basic">
+				<view>提单号</view>
+				<view>{{form.fMblno}}</view>
+			</view>
+			<view class="basic">
+				<view>业务日期</view>
+				<view>{{form.fBstime}}</view>
+			</view>
+			<view class="basic">
+				<view>仓管员</view>
+				<view>{{form.fStorekeeper}}</view>
+			</view>
+			<view class="basic">
+				<view>仓库</view>
+				<view>{{form.warehouseName}}</view>
+			</view>
+			<view class="basic">
+				<view>计划件数</view>
+				<view>{{form.fPlanqty}}</view>
+			</view>
+			<view class="basic">
+				<view>计划净重(kg)</view>
+				<view>{{form.fPlannetweight}}</view>
+			</view>
+			<view class="basic">
+				<view>计划毛重(kg)</view>
+				<view>{{form.fPlangrossweight}}</view>
+			</view>
+			<view class="basic">
+				<view>收费提示(kg)</view>
+				<view>{{form.fRemarksFees}}</view>
+			</view>
+			<view class="basic">
+				<view>备注</view>
+				<view>{{form.remark}}</view>
+			</view>
+			<view class="basic" v-for="(item,index) in form.cntrsList" :key="index">
+				<view>箱型/箱量</view>
+				<view>{{form.fMblno}}{{form.fMblno}}</view>
+			</view>
+		</view>
+		<view class="ordertop" v-if="type.refno4 == 'CKDB'">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">基础信息</text>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>客户</view>
+				<view>{{form.corpName}}</view>
+			</view>
+			<view class="basic">
+				<view>作业类型</view>
+				<view>{{form.businessTypeName}}</view>
+			</view>
+			<view class="basic">
+				<view>提单号</view>
+				<view>{{form.fMblno}}</view>
+			</view>
+			<view class="basic">
+				<view>业务日期</view>
+				<view>{{form.fBsdate}}</view>
+			</view>
+			<view class="basic">
+				<view>业务时间</view>
+				<view>{{form.updateTime}}</view>
+			</view>
+			<view class="basic">
+				<view>仓管员</view>
+				<view>{{form.fStorekeeper}}</view>
+			</view>
+			<view class="basic">
+				<view>调入仓库</view>
+				<view>{{form.inWarehouseName}}</view>
+			</view>
+			<view class="basic">
+				<view>调出仓库</view>
+				<view>{{form.warehouseName}}</view>
+			</view>
+			<view class="basic">
+				<view>单据编号</view>
+				<view>{{form.fBillno}}</view>
+			</view>
+			<view class="basic">
+				<view>计划件数</view>
+				<view>{{form.fPlanqty}}</view>
+			</view>
+			<view class="basic">
+				<view>计划净重(kg)</view>
+				<view>{{form.fPlannetweight}}</view>
+			</view>
+			<view class="basic">
+				<view>计划毛重(kg)</view>
+				<view>{{form.fPlangrossweight}}</view>
+			</view>
+			<view class="basic">
+				<view>备注</view>
+				<view>{{form.remark}}</view>
+			</view>
+			<view class="basic" v-for="(item,index) in form.cntrsList" :key="index">
+				<view>箱型/箱量</view>
+				<view>{{form.fMblno}}{{form.fMblno}}</view>
+			</view>
+		</view>
+		<view class="ordertop" v-if="type.refno4 == 'HQZY'">
+			<view>
+				<view class="iconblue"></view>
+				<text class="license">基础信息</text>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>客户</view>
+				<view>{{form.corpName}}</view>
+			</view>
+			<view class="basic">
+				<view>新客户</view>
+				<view>{{form.toCorpName}}</view>
+			</view>
+			<view class="basic">
+				<view>业务编号</view>
+				<view>{{form.fBillno}}</view>
+			</view>
+			<view class="basic">
+				<view>货转日期</view>
+				<view>{{form.fBsdate}}</view>
+			</view>
+			<view class="basic">
+				<view>仓储费日期</view>
+				<view>{{form.fChargedate}}</view>
+			</view>
+			<view class="basic">
+				<view>仓库</view>
+				<view>{{form.warehouseName}}</view>
+			</view>
+			<view class="basic">
+				<view>结算方式</view>
+				<view>{{form.stltypeName}}</view>
+			</view>
+			<view class="basic">
+				<view>计费单位</view>
+				<view>{{form.feetunitName}}</view>
+			</view>
+			<view class="basic">
+				<view>贸易方式</view>
+				<view>{{form.newTrademodeName}}</view>
+			</view>
+			<view class="basic">
+				<view>提单号</view>
+				<view>{{form.fMblno}}</view>
+			</view>
+			<view class="basic">
+				<view>品牌</view>
+				<view>{{form.fMarks}}</view>
+			</view>
+			<view class="basic">
+				<view>品名</view>
+				<view>{{form.fProductName}}</view>
+			</view>
+			<view class="basic">
+				<view>制单人</view>
+				<view>{{form.createBy}}</view>
+			</view>
+			<view class="basic" v-for="(item,index) in form.cntrsList" :key="index">
+				<view>箱型/箱量</view>
+				<view>{{form.fMblno}}{{form.fMblno}}</view>
+			</view>
+		</view>
+		<view class="ordertop" v-if="form.enclosureList != null">
+			<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 form.enclosureList" :key="index">
+				<view>{{item.fName}}</view>
+				<view>
+					<u-button type="primary" :ripple="true" ripple-bg-color="#909399" size="mini" @click="previewDocx(item.fUrl)">查看</u-button>
+				</view>
+			</view>
+		</view>
+		<view style="width: 100%;position:fixed; bottom:0rpx;background-color: #FFFFFF;padding-left: 40rpx;padding-right: 40rpx;margin-bottom: 30rpx;margin-top: 100rpx;">
+			<view style="float: left;width: 49%;">
+				<u-button type="primary" @click="appToExamine(true)">审核通过</u-button>
+			</view>
+			<view style="float: right;width: 49%;">
+				<u-button type="primary" @click="appToExamine(false)">审核拒绝</u-button>
+			</view>
+		</view>
+		<u-modal v-model="showTwo" :title="titleTwo" :show-cancel-button="true" :content-style="{margin: '40rpx auto'}"
+			@confirm="confirmTwo">
+			<view class="slot-content">
+				<!-- <rich-text v-if="ToExamineType == true && dataList.length > 0" :nodes="content" style="text-align: center;"></rich-text> -->
+				<u-form v-if="ToExamineType == true" style="width: 90%;margin: 0 auto;">
+					<u-form-item label="同意意见:" label-width="130rpx">
+						<u-input height="20rpx" :clearable="false" type="textarea" v-model="valueTwo" />
+					</u-form-item>
+				</u-form>
+				<u-form v-else style="width: 90%;margin: 0 auto;">
+					<u-form-item label="拒绝理由:" label-width="130rpx">
+						<u-input height="20rpx" :clearable="false" type="textarea" v-model="valueTwo" />
+					</u-form-item>
+				</u-form>
+			</view>
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				titleTwo: '',
+				showTwo: false,
+				ToExamineType: '',
+				valueTwo: '',
+				type: {},
+				form: {}
+			}
+		},
+		onLoad: function(option) {
+			this.type = JSON.parse(option.form)
+			this.$u.get('warehouseBusiness/goodsTransfer/app?id=' + this.type.billId).then(res => {
+				console.log(res.data)
+				this.form = res.data
+				if (this.form.cntrsList == null) this.form.cntrsList = []
+			})
+		},
+		methods: {
+			confirmTwo() {
+				if (this.ToExamineType == false) {
+					if (this.valueTwo) {
+						this.$u.post('/warehouse/paths/approvalRejected', {
+							actId: this.type.actId,
+							auditItem: new Date().getFullYear() + '-' + Number(new Date().getMonth()+1) + '-' + new Date().getDate(),
+							auditMsg: this.valueTwo,
+							auditUserId: uni.getStorageSync('userId'),
+							billId: this.form.fId,
+							id: this.form.fId
+						}).then(res => {
+							uni.navigateBack();
+						})
+					} else {
+						this.showTwo = true
+						uni.showToast({
+							icon: 'none',
+							title: '请填写拒绝理由',
+							position: "center"
+						})
+					}
+				} else {
+					// let tiem = moment(Date.parse(new Date())).format('YYYY-MM-DD')
+					if (this.valueTwo) {
+						this.$u.post('/warehouse/paths/approved', {
+							actId: this.type.actId,
+							auditItem: new Date().getFullYear() + '-' + Number(new Date().getMonth()+1) + '-' + new Date().getDate(),
+							auditMsg: this.valueTwo,
+							auditUserId: uni.getStorageSync('userId'),
+							billId: this.form.fId,
+							id: this.form.fId
+						}).then(res => {
+							uni.navigateBack();
+						})
+					} else {
+						this.showTwo = true
+						uni.showToast({
+							icon: 'none',
+							title: '请填写同意意见',
+							position: "center"
+						})
+					}
+				}
+			},
+			appToExamine(ToExamineType) {
+				this.ToExamineType = ToExamineType
+				this.showTwo = true
+				if (ToExamineType == true) {
+					this.titleTwo = '确认同意'
+				} else {
+					this.titleTwo = '确认拒绝'
+				}
+			},
+			//预览
+			previewDocx(item){
+				if(item == null){
+					uni.showToast({
+						icon: 'none',
+						title: '无附件',
+						position: "bottom"
+					})
+				}else{
+					uni.downloadFile({
+						url: item,
+						success: (res) => {
+							if (res.statusCode === 200) {
+								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"
+										})
+									}
+								});
+							}
+						}
+					})
+				}
+			},
+		}
+	}
+</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;
+	}
+
+	.various {
+		float: right;
+		width: 150rpx;
+		border: 2rpx solid #3a63cf;
+		text-align: center;
+		border-radius: 100rpx;
+		color: #3a63cf;
+	}
+
+	.line {
+		width: 92%;
+		margin: 0 auto;
+	}
+
+	.license {
+		float: left;
+		font-size: 32rpx;
+	}
+
+	.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/allocation/detailed.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/home/allocation/index.vue

@@ -0,0 +1,333 @@
+<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 =='2'?'3rpx solid #fff':'none')}" @click="suitcase = !suitcase,underline = '2'">提箱日期</view> -->
+				<view :style="{'border-bottom':(underline =='3'?'3rpx solid #fff':'none')}" @click="choiceState = !choiceState,underline = '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.fBillstatus}}</view>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>货主</view>
+				<view>{{item.fCorpid}}</view>
+			</view>
+			<view class="basic">
+				<view>调拨日期</view>
+				<view>{{item.createTime}}</view>
+			</view>
+			<view class="basic">
+				<view>调入仓库</view>
+				<view>{{item.fWarehouseid}}</view>
+			</view>
+			<view class="basic">
+				<view>调出仓库</view>
+				<view>{{item.fInwarehouseid}}</view>
+			</view>
+			<view class="basic">
+				<view>计划件数/件数/毛重(吨)</view>
+				<view>{{item.fPlanqty}}/{{item.fQty}}/{{item.fGrossweight}}</view>
+			</view>
+			<!-- <view class="basic">
+				<view>库管</view>
+				<view>{{item.fContacts}}</view>
+			</view> -->
+			<view class="basic">
+				<view>品名/箱量</view>
+				<view>{{item.fProductName}}/{{item.fCntval}}</view>
+			</view>
+			<!-- <view class="basic" @tap="call_phone(item.fDriverTel)">
+				<view>司机电话</view>
+				<view>{{item.fDriverTel}}</view>
+			</view> -->
+			<view>
+				<view>
+					<view></view>
+					<view></view>
+				</view>
+				<view></view>
+				<view></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-calendar v-model="show" :mode="mode" @change="orderdate"></u-calendar>
+		<u-calendar v-model="suitcase" :mode="mode" @change="suitcaSe"></u-calendar>
+		<u-action-sheet :list="column" @close="underline = '0'" @click="thatOne" v-model="choiceState"></u-action-sheet>
+	</view>
+</template>
+
+<script>
+	// import {request} from '@/common/request/request'
+	export default {
+		data() {
+			return {
+				lisi: [],
+				column: [{
+					text: '计划',
+					value: '1'
+				}, {
+					text: '待入库',
+					value: '2'
+				}, {
+					text: '入库中',
+					value: '3'
+				}, {
+					text: '已入库',
+					value: '4'
+				}],
+				show: false,
+				suitcase: false,
+				choiceState: false,
+				underline: '0',
+				mode: 'range',
+				queryParams: {
+					pageNum: 1, //页数
+					pageSize: 10, //几条数据
+				},
+				status: 'loadmore',
+				iconType: 'flower',
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '实在没有了'
+				},
+				total: 0,
+			}
+		},
+		onShow() {
+			this.query()
+		},
+		onReachBottom() {
+			this.status = 'loading'
+			if (this.lisi.length < this.total) {
+				this.queryParams.pageNum++
+				this.query()
+			} else {
+				this.status = 'nomore'
+			}
+		},
+		created() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 1000);
+			// #ifdef MP-WEIXIN  
+			if (wx.hideHomeButton) {
+				wx.hideHomeButton();
+			}
+			// #endif
+		},
+		onShow() {
+			this.whole()
+		},
+		methods: {
+			call_phone(bphone) {
+				uni.makePhoneCall({
+					phoneNumber: '' + bphone, // 手机号
+				});
+			},
+			thatOne(index) {
+				// console.log(index)
+				// console.log(this.column[index].value)
+				this.lisi = []
+				this.queryParams = {}
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					fItemsStatus: this.column[index].value
+				}
+				this.query()
+			},
+			whole() {
+				this.underline = '0'
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10
+				}
+				this.query()
+			},
+			custom(res) {
+				// console.log(res)
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					fMblno: res
+				}
+				// console.log(this.queryParams)
+				this.query()
+			},
+			orderdate(e) {
+				// console.log(e)
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					timeInterval: [e.startDate + ' ' + '00:00:00', e.endDate + ' ' + '23:59:59']
+				}
+				this.query()
+			},
+			suitcaSe(e) {
+				console.log(e)
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					timeInterval: [e.startDate + ' ' + '00:00:00', e.endDate + ' ' + '23:59:59']
+				}
+				this.query()
+			},
+			query() {
+				this.queryParams.type = 1
+				this.$u.get('/warehouseBusiness/stockTransfer/list', this.queryParams).then(res => {
+					// console.log(res)
+					if (res.code == 500) {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg,
+							position: "bottom"
+						})
+					} else if (res.code == 200) {
+						this.total = res.total
+						this.lisi = this.lisi.concat(res.rows)
+						// this.lisi = res.rows
+						if (this.lisi.length == this.total) {
+							this.status = 'nomore'
+						}
+					}
+				})
+			},
+			viewDetails(item) {
+				// console.log(item)
+				uni.navigateTo({
+					url: './detailed?item=' + JSON.stringify(item)
+				});
+			},
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.basic {
+		width: 94%;
+		margin: 10rpx auto;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.basic>view {
+		margin-bottom: 10rpx;
+	}
+
+	.basic>view:nth-child(1) {
+		color: #797979;
+	}
+
+	.view {
+		width: 96%;
+		margin: 20rpx auto;
+		display: flex;
+		justify-content: space-between
+	}
+
+	.line {
+		width: 92%;
+		margin: 0 auto;
+	}
+
+	.oddnumber {
+		width: 96%;
+		margin: 20rpx auto;
+		margin-bottom: 20rpx;
+	}
+
+	.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;
+	}
+
+	.search {
+		width: 96%;
+		margin: 10rpx auto;
+	}
+
+	.iconblue {
+		width: 10rpx;
+		height: 45rpx;
+		float: left;
+		background-color: #3a63cf;
+		margin-right: 10rpx;
+	}
+
+	.license {
+		float: left;
+		font-size: 32rpx;
+	}
+
+	.various {
+		float: right;
+		width: 150rpx;
+		border: 2rpx solid #3a63cf;
+		text-align: center;
+		border-radius: 100rpx;
+		color: #1669e6;
+	}
+
+	.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/ceshi.vue

@@ -0,0 +1,110 @@
+<template>
+	<!-- <view></view> -->
+	<!-- <view :style="{width: '100%', height: '100%'}" id="view">
+		<video id="preview" style=" width: 100%;" autoplay="autoplay" :src="url"></video>
+	</view> -->
+	<view>
+		<iframe :src="url" width="100%" height="400" id="cameraTest" allowfullscreen/>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				url: '',
+				access_token: ''
+			}
+		},
+		onLoad(option) {
+			this.url = ""
+			uni.request({
+				url: 'https://open.hikyun.com/artemis/oauth/token/v2',
+				method: 'POST',
+				data: {
+					accessKey: "16365122785078383",
+					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)
+				}
+			});
+
+			// this.url = 'rtmp://ns8.indexforce.com/home/mystream'
+			// this.getUrl(option.id);
+			// uni.setNavigationBarTitle({
+			// 	title:option.title
+			// })
+		},
+		methods: {
+			getUrl(id) {
+				var paramA = {
+					action: 'app/shipinbofang/searchUrl',
+					noid: id,
+					actiondesc: '根据监控id生成预览url'
+				};
+				this.$request
+					.post(paramA.action, paramA)
+					.then(data => {
+						if (data.success) {
+							this.url = data.url;
+						}
+					})
+			},
+		}
+	}
+</script>
+
+
+<!-- <template>
+		<view>
+			<view class="content">
+			    <image class="logo" src="/static/logo.png"></image>
+			    <view class="text-area">
+			        <button type="default" @click="hkPreview">实时视频预览</button>
+			        <button type="default" @click="hkFullPreview">直接全屏预览</button>
+			    </view>
+			</view>
+		</view>
+</template>
+
+```javascript
+
+<script>
+    //导入本地插件
+    const hk = uni.requireNativePlugin('hk-preview');
+    export default {
+        data() {
+            return {
+				src:'rtmp://ns8.indexforce.com/home/mystream',
+                title: 'Hello',
+				url:'rtmp://live.hkstv.hk.lxdns.com/live/hks1'
+            }
+        },
+        onLoad() {
+
+        },
+		created() {
+			
+		},
+        methods: {
+            hkPreview() {
+                //有云台设备，显示操作云台菜单
+                //ip地址，用户名，密码，端口号，通道号
+                hk.startActivity("http://zijun.qdcandor.com","admin","Zhongdian12#$","80","1")
+            },
+            hkFullPreview() {
+                //无云台设备直接全屏播放
+                //ip地址，用户名，密码，端口号，通道号
+                hk.startFullActivity("http://zijun.qdcandor.com","admin","Zhongdian12#$","7101","1")
+            }
+        }
+    }
+</script> -->

pages/home/goodsTransfer/index.vue

@@ -0,0 +1,332 @@
+<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 =='2'?'3rpx solid #fff':'none')}" @click="suitcase = !suitcase,underline = '2'">提箱日期</view> -->
+				<view :style="{'border-bottom':(underline =='3'?'3rpx solid #fff':'none')}" @click="choiceState = !choiceState,underline = '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.fBillstatus}}</view>
+			</view>
+			<view class="line">
+				<u-line color="#ccc" border-style='dashed' />
+			</view>
+			<view class="basic">
+				<view>原客户</view>
+				<view>{{item.corpName}}</view>
+			</view>
+			<view class="basic">
+				<view>现客户</view>
+				<view>{{item.corpName}}</view>
+			</view>
+			<view class="basic">
+				<view>货转日期</view>
+				<view>{{item.fBsdate}}</view>
+			</view>
+			<view class="basic">
+				<view>仓库</view>
+				<view>{{item.fWarehouseName}}</view>
+			</view>
+			<view class="basic">
+				<view>计划件数/件数/毛重(吨)</view>
+				<view>{{item.fPlanqty}}/{{item.fQty}}/{{item.fGrossweight}}</view>
+			</view>
+			<!-- <view class="basic">
+				<view>库管</view>
+				<view>{{item.fContacts}}</view>
+			</view> -->
+			<view class="basic">
+				<view>品名/箱量</view>
+				<view>{{item.goodsName}}/{{item.fCntval}}</view>
+			</view>
+			<!-- <view class="basic" @tap="call_phone(item.fDriverTel)">
+				<view>司机电话</view>
+				<view>{{item.fDriverTel}}</view>
+			</view> -->
+			<view>
+				<view>
+					<view></view>
+					<view></view>
+				</view>
+				<view></view>
+				<view></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-calendar v-model="show" :mode="mode" @change="orderdate"></u-calendar>
+		<u-calendar v-model="suitcase" :mode="mode" @change="suitcaSe"></u-calendar>
+		<u-action-sheet :list="column" @close="underline = '0'" @click="thatOne" v-model="choiceState"></u-action-sheet>
+	</view>
+</template>
+
+<script>
+	// import {request} from '@/common/request/request'
+	export default {
+		data() {
+			return {
+				lisi: [],
+				column: [{
+					text: '计划',
+					value: '1'
+				}, {
+					text: '待入库',
+					value: '2'
+				}, {
+					text: '入库中',
+					value: '3'
+				}, {
+					text: '已入库',
+					value: '4'
+				}],
+				show: false,
+				suitcase: false,
+				choiceState: false,
+				underline: '0',
+				mode: 'range',
+				queryParams: {
+					pageNum: 1, //页数
+					pageSize: 10, //几条数据
+				},
+				status: 'loadmore',
+				iconType: 'flower',
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '实在没有了'
+				},
+				total: 0,
+			}
+		},
+		onShow() {
+			this.query()
+		},
+		onReachBottom() {
+			this.status = 'loading'
+			if (this.lisi.length < this.total) {
+				this.queryParams.pageNum++
+				this.query()
+			} else {
+				this.status = 'nomore'
+			}
+		},
+		created() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 1000);
+			// #ifdef MP-WEIXIN  
+			if (wx.hideHomeButton) {
+				wx.hideHomeButton();
+			}
+			// #endif
+		},
+		onShow() {
+			this.whole()
+		},
+		methods: {
+			call_phone(bphone) {
+				uni.makePhoneCall({
+					phoneNumber: '' + bphone, // 手机号
+				});
+			},
+			thatOne(index) {
+				// console.log(index)
+				// console.log(this.column[index].value)
+				this.lisi = []
+				this.queryParams = {}
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					fItemsStatus: this.column[index].value
+				}
+				this.query()
+			},
+			whole() {
+				this.underline = '0'
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10
+				}
+				this.query()
+			},
+			custom(res) {
+				// console.log(res)
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					fMblno: res
+				}
+				// console.log(this.queryParams)
+				this.query()
+			},
+			orderdate(e) {
+				// console.log(e)
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					timeInterval: [e.startDate + ' ' + '00:00:00', e.endDate + ' ' + '23:59:59']
+				}
+				this.query()
+			},
+			suitcaSe(e) {
+				console.log(e)
+				this.lisi = []
+				this.queryParams = []
+				this.queryParams = {
+					pageNum: 1,
+					pageSize: 10,
+					timeInterval: [e.startDate + ' ' + '00:00:00', e.endDate + ' ' + '23:59:59']
+				}
+				this.query()
+			},
+			query() {
+				this.$u.get('/warehouseBusiness/applets/inStockList', this.queryParams).then(res => {
+					// console.log(res)
+					if (res.code == 500) {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg,
+							position: "bottom"
+						})
+					} else if (res.code == 200) {
+						this.total = res.total
+						this.lisi = this.lisi.concat(res.rows)
+						// this.lisi = res.rows
+						if (this.lisi.length == this.total) {
+							this.status = 'nomore'
+						}
+					}
+				})
+			},
+			viewDetails(item) {
+				// console.log(item)
+				uni.navigateTo({
+					url: './detailed?item=' + JSON.stringify(item)
+				});
+			},
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.basic {
+		width: 94%;
+		margin: 10rpx auto;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.basic>view {
+		margin-bottom: 10rpx;
+	}
+
+	.basic>view:nth-child(1) {
+		color: #797979;
+	}
+
+	.view {
+		width: 96%;
+		margin: 20rpx auto;
+		display: flex;
+		justify-content: space-between
+	}
+
+	.line {
+		width: 92%;
+		margin: 0 auto;
+	}
+
+	.oddnumber {
+		width: 96%;
+		margin: 20rpx auto;
+		margin-bottom: 20rpx;
+	}
+
+	.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;
+	}
+
+	.search {
+		width: 96%;
+		margin: 10rpx auto;
+	}
+
+	.iconblue {
+		width: 10rpx;
+		height: 45rpx;
+		float: left;
+		background-color: #3a63cf;
+		margin-right: 10rpx;
+	}
+
+	.license {
+		float: left;
+		font-size: 32rpx;
+	}
+
+	.various {
+		float: right;
+		width: 150rpx;
+		border: 2rpx solid #3a63cf;
+		text-align: center;
+		border-radius: 100rpx;
+		color: #1669e6;
+	}
+
+	.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/home.vue

@@ -1,204 +1,227 @@
-<template>
-	<view>
-		<view style="
-			background: url(../../static/homeBG.png)no-repeat;
-			height: 340rpx;
-			background-size:100%;
-			box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);">
-			<u-navbar :is-back="false" :is-fixed="false" :border-bottom="false" :background="background">
-				<view style="width: 96%;margin: 0 auto;">
-					<u-search placeholder="请输入您要搜索的内容" bg-color="#FFFFFF" :action-style="actionStyle"></u-search>
-				</view>
-			</u-navbar>
-			<!-- 快捷功能 -->
-			<view style="height: 150rpx;margin-top: -20rpx;">
-				<u-grid :col="3" :border="false">
-					<u-grid-item bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
-						<u-icon name="order" color="#fff" size="60"></u-icon>
-						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">我的数据</view>
-					</u-grid-item>
-					<u-grid-item @click="myReview" bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
-						<u-badge type="error" :count="totalTwo" style="margin-right: 30rpx;" />
-						<u-icon name="edit-pen" color="#fff" size="60"></u-icon>
-						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">我的审核</view>
-					</u-grid-item>
-					<u-grid-item @click="scanCode" bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
-						<u-icon name="scan" color="#fff" size="60"></u-icon>
-						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">扫一扫</view>
-					</u-grid-item>
-				</u-grid>
-			</view>
-			<!-- 正文内容 -->
-			<view class="content">
-				<u-grid :col="4" :border="false">
-					<u-grid-item @click="jumpPath(1)">
-						<u-icon name="arrow-downward" :size="46"></u-icon>
-						<view class="grid-text">我的入库</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(2)">
-						<u-icon name="arrow-upward" :size="46"></u-icon>
-						<view class="grid-text">我的出库</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(3)">
-						<u-icon name="hourglass" :size="46"></u-icon>
-						<view class="grid-text">我的调拨</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(4)">
-						<u-icon name="photo" :size="46"></u-icon>
-						<view class="grid-text">我的货转</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(5)">
-						<u-icon name="lock" :size="46"></u-icon>
-						<view class="grid-text">我的库存</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(6)">
-						<u-icon name="lock" :size="46"></u-icon>
-						<view class="grid-text">海运费计算</view>
-					</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(8)">
-						<u-badge type="error" :count="total" />
-						<u-icon name="checkmark-circle" :size="46"></u-icon>
-						<view class="grid-text">我的采购</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath('null')">
-						<u-icon name="grid" :size="46"></u-icon>
-						<view class="grid-text">其他</view>
-					</u-grid-item> -->
-				</u-grid>
-			</view>
-			<view style="width: 96%;margin: 0 auto;">
-				<u-image width="100%" height="170rpx" src="../../static/activityDiagram.png"></u-image>
-			</view>
+<template>
+	<view>
+		<view style="
+			background: url(../../static/homeBG.png)no-repeat;
+			height: 340rpx;
+			background-size:100%;
+			box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);">
+			<u-navbar :is-back="false" :is-fixed="false" :border-bottom="false" :background="background">
+				<view style="width: 96%;margin: 0 auto;">
+					<u-search placeholder="请输入您要搜索的内容" bg-color="#FFFFFF" :action-style="actionStyle"></u-search>
+				</view>
+			</u-navbar>
+			<!-- 快捷功能 -->
+			<view style="height: 150rpx;margin-top: -20rpx;">
+				<u-grid :col="3" :border="false">
+					<u-grid-item bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
+						<u-icon name="order" color="#fff" size="60"></u-icon>
+						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">我的数据</view>
+					</u-grid-item>
+					<u-grid-item @click="myReview" bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
+						<u-badge type="error" :count="totalTwo" style="margin-right: 30rpx;" />
+						<u-icon name="edit-pen" color="#fff" size="60"></u-icon>
+						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">我的审核</view>
+					</u-grid-item>
+					<u-grid-item @click="scanCode" bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
+						<u-icon name="scan" color="#fff" size="60"></u-icon>
+						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">扫一扫</view>
+					</u-grid-item>
+				</u-grid>
+			</view>
+			<!-- 正文内容 -->
+			<view class="content">
+				<u-grid :col="4" :border="false">
+					<u-grid-item @click="jumpPath(1)">
+						<u-icon name="arrow-downward" :size="46"></u-icon>
+						<view class="grid-text">我的入库</view>
+					</u-grid-item>
+					<u-grid-item @click="jumpPath(2)">
+						<u-icon name="arrow-upward" :size="46"></u-icon>
+						<view class="grid-text">我的出库</view>
+					</u-grid-item>
+					<u-grid-item @click="jumpPath(3)">
+						<u-icon name="hourglass" :size="46"></u-icon>
+						<view class="grid-text">我的调拨</view>
+					</u-grid-item>
+					<u-grid-item @click="jumpPath(4)">
+						<u-icon name="photo" :size="46"></u-icon>
+						<view class="grid-text">我的货转</view>
+					</u-grid-item>
+					<u-grid-item @click="jumpPath(5)">
+						<u-icon name="lock" :size="46"></u-icon>
+						<view class="grid-text">我的库存</view>
+					</u-grid-item>
+					<u-grid-item @click="jumpPath(6)">
+						<u-icon name="lock" :size="46"></u-icon>
+						<view class="grid-text">海运费计算</view>
+					</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>
+					</u-grid-item>
+					<!-- <u-grid-item @click="jumpPath(8)">
+						<u-badge type="error" :count="total" />
+						<u-icon name="checkmark-circle" :size="46"></u-icon>
+						<view class="grid-text">我的采购</view>
+					</u-grid-item> -->
+					<u-grid-item @click="jumpPath('null')">
+						<u-icon name="grid" :size="46"></u-icon>
+						<view class="grid-text">其他</view>
+					</u-grid-item>
+				</u-grid>
+			</view>
+			<view style="width: 96%;margin: 0 auto;">
+				<u-image width="100%" height="170rpx" src="../../static/activityDiagram.png"></u-image>
+			</view>
 			<view style="width: 96%;margin: 10rpx auto;">
-				<u-image width="100%" height="900rpx" src="../../static/image/advertisingMap.png"></u-image>
-			</view>
-			<view style="width: 96%;margin: 0 auto;height: 100rpx;">
-				<!-- <h1>全新功能正在开发中</h1> -->
-			</view>
-		</view>
-		<!-- 更新组件 force 是否强制更新    tabbar：页面是否有原生tabbar组件-->
-		<app-update ref="app_update" :force="false" :tabbar="true"></app-update>
-	</view>
-</template>
-
-<script>
-	import appUpdate from "@/components/yzhua006-update/app-update.vue"
-	export default {
-		components: {
-			appUpdate
-		},
-		data() {
-			return {
-				background: {
-					backgroundImage: 'none',
-					backgroundColor: 'none'
-				},
-				actionStyle: {
-					color: '#fff'
-				},
-				deptName: '',
-				form: {
-					pageNum: 1,
-					pageSize: 10,
-					fBilltype: 'SQ',
-					fTakeOrders: 0
-				},
-				total: '',
-				totalTwo: ''
-			}
-		},
-		onShow() {
-			this.$nextTick(function() {
-				this.testUpgrade()
-			})
-			// this.deptName = uni.getStorageSync('deptName')
-			// if (this.deptName == '外部用户') {
-			// 	this.$u.get('/anPin/anPinApp/supplier', this.form).then(res => {
-			// 		this.dataList = res.rows
-			// 		this.total = res.total
-			// 	})
-			// } else {
-			// 	this.$u.get('/anPin/anPinApp/list', this.form).then(res => {
-			// 		this.dataList = res.rows
-			// 		this.total = res.total
-			// 	})
-			// }
-			// this.$u.get('/warehouse/paths/selectOrderAuditItems', {
-			// 	refno2: 'SQ',
-			// 	auditStatus: 'S'
-			// }).then(res => {
-			// 	this.totalTwo = res.data.length
-			// })
-		},
-		methods: {
-			testUpgrade() {
-				this.$refs.app_update.update(); //调用子组件 检查更新
-			},
-			scanCode() {
-				uni.scanCode({
-					success: res => {
-						console.log(res.result)
-					}
-				});
-			},
-			jumpPath(res) {
-				switch (res) {
-					case 1:
-						this.$u.route('/pages/home/myorder/index');
-						break;
-					case 2:
-						this.$u.route('/pages/home/delivery/index');
-						break;
-					case 6:
-						this.$u.route('/pages/home/freightCalculation/shipSchedule');
-						break;
-					case 7:
-						this.$u.route('/pages/home/patrolInspection/index');
-						break;
-					case 8:
-						this.$u.route('/pages/home/procurementApplicationApproval/index');
-						break;
-					default:
-						uni.showToast({
-							icon: 'none',
-							title: '该功能暂未开发~',
-							position: "bottom"
-						})
-						break;
-				}
-			},
-			myReview() {
-				this.$u.route('/pages/home/myReview/index');
-			},
-			myData() {
-				uni.showToast({
-					icon: 'none',
-					title: '该功能暂未开发~',
-					position: "bottom"
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.content {
-		width: 96%;
-		margin: 0 auto;
-		box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);
-		background-color: #FFFFFF;
-		margin-top: 20rpx;
-		border-radius: 20rpx;
-		padding: 10rpx;
-	}
-
-	.grid-text {
-		font-size: 28rpx;
-		margin-top: 4rpx;
-		color: $u-type-info;
-	}
+				<u-image width="100%" height="900rpx" src="../../static/image/advertisingMap.png"></u-image>
+				<!-- <p style="text-indent:50rpx;margin-bottom: 20rpx;">青岛中电国际物流有限公司业务范围包括：大宗货物运输、大型设备运输、冷链运输等，承接全国各地货物运输业务。</p> -->
+
+				<!-- <p style="text-indent:50rpx;margin-bottom: 20rpx;">在传统的国际国内集装箱运输及代理业务基础上，公司现有综合业务包括大型仓储拆箱配送物流、多式联运、大陆桥运输、散杂货物租船代运、项目物流、仓储等全方位的物流服务。 青岛中电国际物流有限公司拥有一支精良的项目管理队伍，以客户需求的为主要目标，致力于为客户提供全方位、一流的物流运输方案和实践。</p> -->
+
+				<!-- <p style="text-indent:50rpx;margin-bottom: 20rpx;">公司始终坚持以诚信、效率、创新为经营宗旨，并注重长期关系。从业人员经过物流知识三年专业培训方能上岗，公司坚持“以人为本”的管理思想，以“诚信创新、敬业、奋进”为企业精神，全方位为客户提供服务。</p> -->
+
+				<!-- <p style="text-indent:50rpx;">我们可针对客户需求订制个性化解决方案，将运输管理、仓库管理以及订单管理进行一体化整合，公司统一管理，统一调度，实现了规模化，现代化管理模式。</p> -->
+			</view>
+			<view style="width: 96%;margin: 0 auto;height: 100rpx;">
+				<!-- <h1>全新功能正在开发中</h1> -->
+			</view>
+		</view>
+		<!-- 更新组件 force 是否强制更新    tabbar：页面是否有原生tabbar组件-->
+		<app-update ref="app_update" :force="false" :tabbar="true"></app-update>
+	</view>
+</template>
+
+<script>
+	import appUpdate from "@/components/yzhua006-update/app-update.vue"
+	export default {
+		components: {
+			appUpdate
+		},
+		data() {
+			return {
+				background: {
+					backgroundImage: 'none',
+					backgroundColor: 'none'
+				},
+				actionStyle: {
+					color: '#fff'
+				},
+				deptName: '',
+				form: {
+					pageNum: 1,
+					pageSize: 10,
+					fBilltype: 'SQ',
+					fTakeOrders: 0
+				},
+				total: '',
+				totalTwo: ''
+			}
+		},
+		onShow() {
+			this.$nextTick(function() {
+				this.testUpgrade()
+			})
+			// this.deptName = uni.getStorageSync('deptName')
+			// if (this.deptName == '外部用户') {
+			// 	this.$u.get('/anPin/anPinApp/supplier', this.form).then(res => {
+			// 		this.dataList = res.rows
+			// 		this.total = res.total
+			// 	})
+			// } else {
+			// 	this.$u.get('/anPin/anPinApp/list', this.form).then(res => {
+			// 		this.dataList = res.rows
+			// 		this.total = res.total
+			// 	})
+			// }
+			// this.$u.get('/warehouse/paths/selectOrderAuditItems', {
+			// 	refno2: 'SQ',
+			// 	auditStatus: 'S'
+			// }).then(res => {
+			// 	this.totalTwo = res.data.length
+			// })
+		},
+		methods: {
+			testUpgrade() {
+				this.$refs.app_update.update(); //调用子组件 检查更新
+			},
+			scanCode() {
+				uni.scanCode({
+					success: res => {
+						console.log(res.result)
+					}
+				});
+			},
+			jumpPath(res) {
+				switch (res) {
+					case 1:
+						this.$u.route('/pages/home/myorder/index');
+						break;
+					case 2:
+						this.$u.route('/pages/home/delivery/index');
+						break;
+					// case 3:
+					// 	this.$u.route('/pages/home/allocation/index');
+					// 	break;
+					// case 4:
+					// 	this.$u.route('/pages/home/goodsTransfer/index');
+					// 	break;
+					case 5:
+						this.$u.route('/pages/home/inventoryQuery/index');
+						break;
+					case 6:
+						this.$u.route('/pages/home/freightCalculation/shipSchedule');
+						break;
+					case 7:
+						this.$u.route('/pages/home/patrolInspection/index');
+						break;
+					case 8:
+						this.$u.route('/pages/home/procurementApplicationApproval/index');
+						break;
+					case 12:
+						this.$u.route('/pages/home/ceshi');
+						break;
+					default:
+						uni.showToast({
+							icon: 'none',
+							title: '该功能暂未开发~',
+							position: "bottom"
+						})
+						break;
+				}
+			},
+			myReview() {
+				this.$u.route('/pages/home/myReview/index');
+			},
+			myData() {
+				uni.showToast({
+					icon: 'none',
+					title: '该功能暂未开发~',
+					position: "bottom"
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		width: 96%;
+		margin: 0 auto;
+		box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);
+		background-color: #FFFFFF;
+		margin-top: 20rpx;
+		border-radius: 20rpx;
+		padding: 10rpx;
+	}
+
+	.grid-text {
+		font-size: 28rpx;
+		margin-top: 4rpx;
+		color: $u-type-info;
+	}
 </style>

pages/home/inventoryQuery/index.vue

@@ -0,0 +1,184 @@
+<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> -->
+		<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;
+	}
+</style>

pages/home/myReview/index.vue

@@ -1,24 +1,41 @@
 <template>
 	<view>
-		<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		<!-- 选择业务类型 -->
+		<u-action-sheet :list="billTypeList" :tips="{text: '请选择业务类型',color: '#2979ff',fontSize: 36}" v-model="opengShow" :mask-close-able="false" :cancel-btn="false" @click="actionSheet"/>
+
+		<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"/>
 		<!-- 时间选择组件 -->
-		<u-calendar v-model="show" max-date="2050" mode="range" :closeable="false" :mask-close-able="false" @change="changeTwo"></u-calendar>
-		<!-- 状态选择组件 -->
-		<u-action-sheet :list="listData" v-model="showTwo" :mask-close-able="false" @click="click" @close="close"></u-action-sheet>
-		<view v-for="(item,index) in dataList" :key="index"
-			style="box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);width: 96%;border-top-right-radius: 10rpx;margin: 10rpx auto;padding-top: 10rpx;">
-			<span
-				style="width: 10rpx;height: 40rpx;background-color: #2979ff;display: block;float: left;margin-top: 10rpx;"></span>
-			<h4
-				style="width: 140rpx;border-radius: 200rpx;text-align: center;color: #2979ff;border: 2rpx solid #1785FF;float: right;margin-right: 10rpx;margin-top: 10rpx;">
+		<u-calendar v-model="show" max-date="2050" mode="range" :closeable="false" :mask-close-able="false" @change="changeTwo" />
+		<!-- 状态选择组件 -->
+		<u-action-sheet :list="listData" v-model="showTwo" :mask-close-able="false" @click="click" @close="close" />
+		<view v-for="(item,index) in dataList" :key="index" style="box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);width: 96%;border-top-right-radius: 10rpx;margin: 10rpx auto;padding-top: 10rpx;">
+			<span style="width: 10rpx;height: 40rpx;background-color: #2979ff;display: block;float: left;margin-top: 10rpx;"></span>
+			<h4 style="width: 140rpx;border-radius: 200rpx;text-align: center;color: #2979ff;border: 2rpx solid #1785FF;float: right;margin-right: 10rpx;margin-top: 10rpx;">
 				{{item.audit}}
 			</h4>
-			<view style="width: 90%;margin: 0 auto;margin: 0 auto;">
-				<view
-					style="display: flex;justify-content: space-between;height: 60rpx;line-height: 60rpx;border-bottom: 1rpx solid #eff4ff;">
-					<h4>系统编号：{{item.refno3}}</h4>
+			<view style="width: 90%;margin: 0 auto;">
+				<view style="display: flex;justify-content: space-between;height: 60rpx;line-height: 60rpx;border-bottom: 1rpx solid #eff4ff;">
+					<h4>{{item.type == '仓库'? '提单号：'+item.fmblno :'系统编号：'+item.refno3}}</h4>
 				</view>
-				<view>
+				<view v-if="item.type == '仓库'">
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">项目名称</view>
+						<view style="float: right;">{{item.actName}}</view>
+					</view>
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">贸易方式</view>
+						<view style="float: right;">{{item.ftrademodeid}}</view>
+					</view>
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">商品名称</view>
+						<view style="float: right;">{{item.goodsName}}</view>
+					</view>
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">仓库名称</view>
+						<view style="float: right;">{{item.warehouseName}}</view>
+					</view>
+				</view>
+				<view v-else>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
 						<view style="float: left;">供应商</view>
 						<view style="float: right;">{{item.refno1}}</view>
@@ -64,6 +81,7 @@
 				</view>
 			</view>
 		</view>
+		<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
 	</view>
 </template>
 
@@ -71,176 +89,263 @@
 	export default {
 		data() {
 			return {
-				dataList: [],
-				listData: [{
-					text: '全部',
-					value:null
-				},{
-					text: '提交',
-					value:'0'
-				}, {
-					text: '待审',
-					value:'S'
-				}, {
-					text: '审核退回',
-					value:'B'
-				}, {
-					text: '审核通过',
-					value:'A'
-				}],
-				showTwo:false,
-				show:false,
+				opengShow: true,
+				status: 'loadmore',
+				iconType: 'flower',
+				total: 0,
+				billTypeList: [{
+					text: '入库',
+					value: 'SJRK'
+				}, {
+					text: '出库',
+					value: 'SJCK'
+				}, {
+					text: '调拨',
+					value: 'CKDB'
+				}, {
+					text: '货转',
+					value: 'HQZY'
+				}],
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '实在没有了'
+				},
+				dataList: [],
+				listData: [{
+					text: '全部',
+					value: null
+				}, {
+					text: '提交',
+					value: '0'
+				}, {
+					text: '待审',
+					value: 'S'
+				}, {
+					text: '审核退回',
+					value: 'B'
+				}, {
+					text: '审核通过',
+					value: 'A'
+				}],
+				showTwo: false,
+				show: false,
+				billType: '',
 				list: [{
 					name: '待审核'
 				}, {
-					name: '提货时间'
+					name: this.type = '仓库' ? '申请时间' : '提货时间'
 				}, {
 					name: '状态'
+				}, {
+					name: '业务类型'
 				}],
-				current: 0,
-				form:{
-					refno2: 'SQ',
-					auditStatus:'S'
-				}
+				current: 0,
+				form: {
+					//安品默认传
+					// refno2: 'SQ',
+					auditStatus: 'S',
+					pageNum: 1,
+					pageSize: 10
+				},
+				type: '',
 			}
 		},
 		onShow() {
+			this.form = {
+				//安品默认传
+				// refno2: 'SQ',
+				auditStatus: 'S',
+				pageNum: 1,
+				pageSize: 10
+			}
+			this.dataList = []
 			this.queryAudit()
 		},
+		onReachBottom() {
+			this.status = 'loading'
+			if (this.dataList.length < this.total) {
+				this.form.pageNum++
+				this.queryAudit()
+			} else {
+				this.status = 'nomore'
+			}
+		},
 		methods: {
-			change(index) {
-				this.current = index
-				if(index == 1){
-					this.show = true
-				}else if(index ==2){
-					this.showTwo = true
-				}else{
-					this.form = {
-						refno2: 'SQ',
-						auditStatus:'S'
-					}
-					this.queryAudit(false)
+			actionSheet(index) {
+				this.current = null
+				this.billType = this.billTypeList[index].value
+				this.dataList = []
+				this.queryAudit()
+			},
+			change(index) {
+				this.current = index
+				console.log(index)
+				if (index == 1) {
+					this.show = true
+				} else if (index == 2) {
+					this.showTwo = true
+				} else if (index == 3) {
+					this.opengShow = true
+				} else {
+					this.form = {
+						// 安品默认传
+						// refno2: 'SQ',
+						auditStatus: 'S',
+						pageNum: 1,
+						pageSize: 10
+					}
+					this.dataList = []
+					this.queryAudit(false)
 				}
 			},
 			changeTwo(e) {
-				console.log(e);
-				this.current = null
-				let data = [e.startDate,e.endDate]
-				this.form = {refno2: 'SQ',sendTimeList:data}
+				// console.log(e);
+				this.current = null
+				let data = [e.startDate, e.endDate]
+				if (this.type = '仓库') {
+					this.form = {
+						pageNum: 1,
+						pageSize: 10,
+						sendTimeInterval: data
+					}
+				} else {
+					this.form = {
+						refno2: 'SQ',
+						pageNum: 1,
+						pageSize: 10,
+						sendTimeList: data
+					}
+				}
+				this.dataList = []
+				this.queryAudit()
+			},
+			click(index) {
+				this.form = {
+					// refno2: 'SQ',
+					pageNum: 1,
+					pageSize: 10,
+					auditStatus: this.listData[index].value
+				}
+				this.dataList = []
 				this.queryAudit()
-			},
-			click(index){
-				this.form = {
-					refno2: 'SQ',
-					auditStatus:this.listData[index].value
-				}
-				this.queryAudit()
-				this.current = null
-			},
-			close(){
-				this.current = null
+				this.current = null
 			},
-			queryAudit(e) {
-				// if(e == false) this.current = null
-				console.log(this.form)
+			close() {
+				this.current = null
+			},
+			queryAudit(e) {
+				// if(e == false) this.current = null
+				// console.log(this.form)
+				if (this.billType) this.form.billType = this.billType
 				this.$u.get('/warehouse/paths/selectOrderAuditItems', this.form).then(res => {
-					res.data.map((e) => {
-						if (e.sendTime) {
-							e.sendTime = e.sendTime.slice(0, 10);
-						}
-						if (e.refno2) {
-							switch (e.refno2) {
-								case "SJRK": {
-									e.refno2 = "入库"
-									break;
-								}
-								case "SJCK": {
-									e.refno2 = "出库"
-									break;
-								}
-								case "HQZY": {
-									e.refno2 = "货转"
-									break;
-								}
-								case "CKDB": {
-									e.refno2 = "调拨"
-									break;
-								}
-								case "HWTG": {
-									e.refno2 = "货物通关"
-									break;
-								}
-								case "JSCCF": {
-									e.refno2 = "计算仓储费"
-									break;
-								}
-								case "CCF": {
-									e.refno2 = "仓储费"
-									break;
-								}
-								case "ZYF": {
-									e.refno2 = "作业费"
-									break;
-								}
-								case "SF": {
-									e.refno2 = "收费"
-									break;
-								}
-								case "DZ": {
-									e.refno2 = "对账"
-									break;
-								}
-								case "FF": {
-									e.refno2 = "付费"
-									break;
-								}
-								case "SE": {
-									e.refno2 = "下单配船"
-									break;
-								}
-								case "ApplyFP": {
-									e.refno2 = "凯合开票申请"
-									break;
-								}
-								case "KHDZ": {
-									e.refno2 = "凯合对账"
-									break;
-								}
-								case "KHSF": {
-									e.refno2 = "凯合收费"
-									break;
-								}
-								case "KHFF": {
-									e.refno2 = "凯合付费"
-									break;
-								}
-								case "KHDD": {
-									e.refno2 = "凯合订单"
-									break;
-								}
-								case "XS": {
-									e.refno2 = "销售出库"
-									break;
-								}
-								case "SQ": {
-									e.refno2 = "采购申请"
-									break;
-								}
-								case "XMGL": {
-									e.refno2 = "项目管理"
-									break;
-								}
-								default: {
-									return this.$message.error("未知错误，无状态");
+					this.total = res.total
+					if (res.rows) {
+						this.dataList = this.dataList.concat(res.rows)
+						this.type = '仓库'
+					} else {
+						res.data.map((e) => {
+							if (e.sendTime) {
+								e.sendTime = e.sendTime.slice(0, 10);
+							}
+							if (e.refno2) {
+								switch (e.refno2) {
+									case "SJRK": {
+										e.refno2 = "入库"
+										break;
+									}
+									case "SJCK": {
+										e.refno2 = "出库"
+										break;
+									}
+									case "HQZY": {
+										e.refno2 = "货转"
+										break;
+									}
+									case "CKDB": {
+										e.refno2 = "调拨"
+										break;
+									}
+									case "HWTG": {
+										e.refno2 = "货物通关"
+										break;
+									}
+									case "JSCCF": {
+										e.refno2 = "计算仓储费"
+										break;
+									}
+									case "CCF": {
+										e.refno2 = "仓储费"
+										break;
+									}
+									case "ZYF": {
+										e.refno2 = "作业费"
+										break;
+									}
+									case "SF": {
+										e.refno2 = "收费"
+										break;
+									}
+									case "DZ": {
+										e.refno2 = "对账"
+										break;
+									}
+									case "FF": {
+										e.refno2 = "付费"
+										break;
+									}
+									case "SE": {
+										e.refno2 = "下单配船"
+										break;
+									}
+									case "ApplyFP": {
+										e.refno2 = "凯合开票申请"
+										break;
+									}
+									case "KHDZ": {
+										e.refno2 = "凯合对账"
+										break;
+									}
+									case "KHSF": {
+										e.refno2 = "凯合收费"
+										break;
+									}
+									case "KHFF": {
+										e.refno2 = "凯合付费"
+										break;
+									}
+									case "KHDD": {
+										e.refno2 = "凯合订单"
+										break;
+									}
+									case "XS": {
+										e.refno2 = "销售出库"
+										break;
+									}
+									case "SQ": {
+										e.refno2 = "采购申请"
+										break;
+									}
+									case "XMGL": {
+										e.refno2 = "项目管理"
+										break;
+									}
+									default: {
+										return uni.showToast({
+											icon: 'none',
+											title: '未知错误，无状态',
+											position: "center"
+										})
+									}
 								}
 							}
-						}
-					})
-					this.dataList = res.data
+						})
+						this.dataList = res.data
+					}
 				})
-
 			},
 			expenseDetails(item) {
+				console.log(item)
 				switch (item.refno4) {
 					case 'SQ':
 						this.$u.route('/pages/home/procurementApplicationApproval/detailsOrUpdates', {
@@ -248,6 +353,26 @@
 							toExamine: JSON.stringify(true)
 						});
 						break
+					case 'SJRK':
+						this.$u.route('/pages/home/allReview/index', {
+							form: JSON.stringify(item)
+						});
+						break
+					case 'SJCK':
+						this.$u.route('/pages/home/allReview/index', {
+							form: JSON.stringify(item)
+						});
+						break
+					case 'HQZY':
+						this.$u.route('/pages/home/allReview/index', {
+							form: JSON.stringify(item)
+						});
+						break
+					case 'CKDB':
+						this.$u.route('/pages/home/allReview/index', {
+							form: JSON.stringify(item)
+						});
+						break
 					default:
 						return uni.showToast({
 							icon: 'none',

pages/home/myorder/index.vue

@@ -3,11 +3,9 @@
 		<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 =='1'?'3rpx solid #fff':'none')}" @click="show = !show,underline = '1'">入库日期</view>
 				<!-- <view :style="{'border-bottom':(underline =='2'?'3rpx solid #fff':'none')}" @click="suitcase = !suitcase,underline = '2'">提箱日期</view> -->
-				<view :style="{'border-bottom':(underline =='3'?'3rpx solid #fff':'none')}"
-					@click="choiceState = !choiceState,underline = '3'">状态</view>
+				<view :style="{'border-bottom':(underline =='3'?'3rpx solid #fff':'none')}" @click="choiceState = !choiceState,underline = '3'">状态</view>
 			</view>
 		</view>
 		<view class="search">

pages/home/myorder/orderDetails/index.vue

@@ -69,6 +69,7 @@
 				<view>{{form.labour}}</view>
 			</view>
 		</view>
+		
 		<view class="ordertop">
 			<view>
 				<view class="iconblue"></view>

pages/home/patrolInspection/index.vue

@@ -53,7 +53,7 @@
 				warehouseList:[],
 				warehouse:false,
 				loadText: {
-					loadmore: '轻轻上拉',
+					loadmore: uni.getStorageSync('deptName') == '外部用户'?'请切换选择仓库':'轻轻上拉',
 					loading: '努力加载中',
 					nomore: '实在没有了'
 				},
@@ -77,8 +77,15 @@
 				total: 0,
 			}
 		},
-		created() {
-			this.query()
+		created() {
+			if(uni.getStorageSync('deptName') == '外部用户'){
+				this.list = [{
+					name: '仓库'
+				}]
+				delete this.form.fInspectionDatetime
+			}else{
+				this.query()
+			}
 			this.$u.get('/warehouse/check/selectTWarehouseListInCheck').then(res=>{
 				console.log(res)
 				for(let item in res.rows){
@@ -111,13 +118,22 @@
 				this.query()
 			},
 			query() {
-				// this.current = null
-				this.$u.get('/warehouse/checkitems/listByUser', this.form).then(res => {
-					console.log(res)
-					this.dataList = this.dataList.concat(res.rows)
-					this.total = res.total
-					if (res.total === 0) this.status = 'nomore'
-				})
+				// this.current = null
+				if(uni.getStorageSync('deptName') == '外部用户'){
+					this.$u.get('/warehouse/checkitems/appListByUser', this.form).then(res => {
+						console.log(res)
+						this.dataList = this.dataList.concat(res.rows)
+						this.total = res.total
+						if (res.total === 0) this.status = 'nomore'
+					})
+				}else{
+					this.$u.get('/warehouse/checkitems/listByUser', this.form).then(res => {
+						console.log(res)
+						this.dataList = this.dataList.concat(res.rows)
+						this.total = res.total
+						if (res.total === 0) this.status = 'nomore'
+					})
+				}
 			},
 			change(e) {
 				// console.log(e)
@@ -134,14 +150,18 @@
 					this.form.fInspectionDatetime = new Date().toLocaleDateString().replace(/\//g,"-")
 					this.dataList = []
 					this.query()
-				}
-				if (index === 0) {
-					this.dataList = []
-					this.form = {
-						pageNum: 1,
-						pageSize: 10
-					}
-					this.query()
+				}
+				if(uni.getStorageSync('deptName') == '外部用户'){
+					this.warehouse = true
+				}else{
+					if (index === 0) {
+						this.dataList = []
+						this.form = {
+							pageNum: 1,
+							pageSize: 10
+						}
+						this.query()
+					}
 				}
 				this.current = index;
 			},

pages/home/patrolInspection/patrolDetails.vue

@@ -46,16 +46,16 @@
 			<view style="width: 92%;margin: 0 auto;margin: 0 auto;">
 				<view
 					style="display: flex;justify-content: space-between;height: 80rpx;line-height: 80rpx;border-bottom: 1rpx solid #eff4ff;">
-					<h3>上传附件</h3>
+					<h3>{{deptName == '外部用户'?fileList.length == 0?'暂无附件':'附件':'上传附件'}}</h3>
 				</view>
 				<view>
-					<u-upload style="width: 100%;" :action="action" @on-success="success" @on-remove="remove" :file-list="fileList" :header="headers"></u-upload>
+					<u-upload style="width: 100%;" :action="action" @on-success="success" @on-remove="remove" :file-list="fileList" :header="headers" :deletable="deptName == '外部用户'?false:true" :max-count="deptName == '外部用户'?fileList.length:99"></u-upload>
 				</view>
 			</view>
 		</view>
 		<view
 			style="width: 100%;position:fixed; bottom:0;background-color: #FFFFFF;padding-left: 20px;padding-right: 20px;padding-bottom: 30rpx;">
-			<u-button type="primary" @click="submit">确认保存</u-button>
+			<u-button type="primary" @click="submit" v-if="deptName != '外部用户'">确认保存</u-button>
 		</view>
 	</view>
 </template>
@@ -68,18 +68,21 @@
 				headers: {
 					Authorization: 'Bearer ' + this.$store.state.vuex_token
 				},
-				form: {},
+				form: {},
+				deptName:'',
 				fileList: [],
 				pictureEist: [],
 				twarehousecheckdetailList: {}
 			}
 		},
-		onLoad(option) {
+		onLoad(option) {
+			this.deptName = uni.getStorageSync('deptName')
 			this.form = JSON.parse(option.form)
 			let scope = {
 				row:JSON.parse(option.form)
-			}
-			this.$u.get('/warehouse/checkitemsdetails/list', {
+			}
+			
+			this.$u.get(this.deptName != '外部用户'?'/warehouse/checkitemsdetails/list':'/warehouse/checkitemsdetails/appList', {
 				fItemFid: this.form.fId
 			}).then(res => {
 				console.log(res)

pages/personalCenter/personalCenter.vue

@@ -6,7 +6,7 @@
 				<u-avatar :src="pic" size="140"></u-avatar>
 			</view>
 			<view class="u-flex-1">
-				<view class="u-font-18 u-p-b-20">用户昵称暂无</view>
+				<view class="u-font-18 u-p-b-20">{{username}}</view>
 				<view class="u-font-14 u-tips-color">云仓号:暂无</view>
 			</view>
 			<view class="u-m-l-10 u-p-10">
@@ -38,11 +38,12 @@
 		data() {
 			return {
 				pic: 'https://uviewui.com/common/logo.png',
-				show: true
+				show: true,
+				username:''
 			}
-		},
-		onLoad() {
-
+		},
+		created() {
+			this.username = uni.getStorageSync('lifeData').vuex_user
 		},
 		methods: {
 			setUp(){