Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erp/index.vue

@@ -45,8 +45,8 @@ import helper from '@/common/helper.js';
 				show2: false,
 				isShowAlert: false,
 				content: '易粮易运ERP系统包含合同管理、仓库管理、运输管理、结算管理等多个模块，可为粮企提供粮食贸易的全流程服务，平台诚邀您的加入。',
-				warehouseName: '',
-				binNumber: '',
+				warehouseName: '暂无仓库',
+				binNumber: '暂无',
 				compId:'',
 				warehouseList: [],
 				warehouseCWList:[],

pages/erp/warehousing/selectContractNo.vue

@@ -3,10 +3,18 @@
 		<view class="content1">
 			<u-search placeholder="输入合同编号" :show-action="false" v-model="inputKeyword"></u-search>
 		</view>
-		<view class="content2" v-if="!inputKeyword">
-			<view class="title">最新合同</view>
+		<view class="content2" v-if="!inputKeyword&&newSelectList.length!=0">
+			<view class="title" v-if="">最新选择</view>
 			<view class="item-contnet">
-				<view class="item-list" v-for="(item,index) in newList" :key="index" @click="confirm(item)">
+				<view class="item-list" v-for="(item,index) in newSelectList" :key="index" @click="confirm(item)">
+					{{item.contractNo}}
+				</view>
+			</view>
+		</view>
+		<view class="content2" v-if="!inputKeyword&&moreList.length!=0 ">
+			<view class="title" v-if="">更多合同</view>
+			<view class="item-contnet">
+				<view class="item-list" v-for="(item,index) in moreList" :key="index" @click="confirm(item)">
 					{{item.contractNo}}
 				</view>
 			</view>
@@ -26,12 +34,14 @@
 			return {
 				inputKeyword: '',
 				newList: [],
+				newSelectList:[],
 				filterNewList: [],
+				moreList:[],
 				compId: ''
 			}
 		},
 		onShow() {},
-		onLoad(options) {
+		onLoad(options) {debugger
 			this.compId = options.compId
 			console.log(helper.selectContractNo); 
 			this.getContractNoList()
@@ -39,7 +49,7 @@
 		watch: {
 			inputKeyword(val) {
 				this.filterNewList = this.newList.filter(function(item) {
-					if (item.contractNo.indexOf(val) > -1) {
+					if (item.contractNo.indexOf(val) > -1&&item.flag==7) {
 						return item
 					}
 				})
@@ -47,9 +57,23 @@
 		},
 		methods: {
 			confirm(item){
-				uni.setStorageSync('ContractNo', item);
+				let _list = uni.setStorageSync('erpContractNoList');
+				if(_list.length<=20){
+					_list.unshift()
+				}else{
+					_list.unshift().pop()
+				}
+				uni.setStorageSync('erpContractNoList', _list);
 				uni.navigateBack({})
 			},
+			makeMoreList(){
+				let _data = this.newList
+				for(let i=0;i<_data;i++){
+					if(_data[i].status=='执行中'&&_data[i].flag==6){
+						this.moreList.push(_data[i])
+					}
+				}
+			},
 			getContractNoList() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 					compId: this.compId,
@@ -58,6 +82,7 @@
 					if (res.data.code == 200) {
 						console.log(res)
 						this.newList = res.data.data
+						this.makeMoreList()
 					}
 				})
 			},

pages/erp/warehousing/warehousing.vue

@@ -355,7 +355,7 @@
 			},
 			slectcontractNo(){
 				uni.navigateTo({
-					url:'/pages/erp/warehousing/selectContractNo'
+					url:'/pages/erp/warehousing/selectContractNo?compId='+this.compId
 				})
 			},
 			slectCarNo(){