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

pages/public/login_account_number.vue

@@ -125,21 +125,21 @@
 								// 	helper.getListByUserId()
 								// })
 							}
+							that.$store.commit('login', res.data.data)
+							var name = 'userInfo';
+							var value = res.data.data;
+							that.$store.commit('$uStore', {
+								name,
+								value
+							});
+							// that.liangxinLogin()
 							
+							uni.switchTab({
+								url: '/pages/sale/information'
+							});
+							uni.hideLoading()
 						})
-						that.$store.commit('login', res.data.data)
-						var name = 'userInfo';
-						var value = res.data.data;
-						that.$store.commit('$uStore', {
-							name,
-							value
-						});
-						// that.liangxinLogin()
 						
-						uni.switchTab({
-							url: '/pages/sale/information'
-						});
-						uni.hideLoading()
 					}else{
 						uni.hideLoading()
 						uni.showToast({

pages/reimbursement/get_request_funds.vue

@@ -15,6 +15,12 @@
 					<view>{{detailData.warehouseName}}</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.purpose == '库点费用'">
+				<view class="title">类型</view>
+				<view class="con-list">
+					<view>{{detailData.wareExpenseType}}</view>
+				</view>
+			</view>
 			<view class="c-row" v-if="detailData.purpose == '合同费用'">
 				<view class="title">合同编号</view>
 				<view class="con-list">

pages/reimbursement/request_funds.vue

@@ -22,6 +22,17 @@
 					</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.purpose == '库点费用'">
+				<view class="title">类型</view>
+				<view class="con-list">
+					<view @click='show2=true'>{{detailData.wareExpenseType?detailData.wareExpenseType:"请选择类型"}}
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
+				</view>
+			</view>
+			<u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2"
+				mode="selector">
+			</u-picker>
 			<view class="c-row" v-if="detailData.purpose == '合同费用'">
 				<view class="title">合同编号</view>
 				<view class="con-list">
@@ -132,10 +143,12 @@
 		data() {
 			return {
 				show: false,
+				show2:false,
 				showWare: false,
 				detailData: {
 					purpose: '库点费用',
 					remark: "",
+					wareExpenseType:'杂费',
 					warehouseName: '选择仓库',
 					expenseName: '',
 					amountMoney: '',
@@ -167,6 +180,12 @@
 						purpose: "经营性费用"
 					},
 				],
+				typeList:[
+					{value: "杂费"},
+					{value: "电费"},
+					{value: "煤费"},
+					{value: "人工费"},
+				],
 				namelist:[{
 						name: "黑龙江中天昊元贸易有限公司"},
 					{name: "中天昊元-建发合营"},
@@ -252,6 +271,9 @@
 			}
 		},
 		methods: {
+			typeCheck(e){
+				this.detailData.wareExpenseType=this.typeList[e[0]].value
+			},
 			afterRead(e) {
 				console.log(e)
 			},

pages/user/user.vue

@@ -397,7 +397,23 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onShow() {
-			console.log("uni.getStorageSync('compName1')")
+			// console.log(111111111)
+			if(uni.getStorageSync('pcUserInfo')){
+				// console.log(2222222)
+				for (var i = 0; i < this.gridList1.length; i++) {
+					if(this.gridList1[i].num==0||this.gridList1[i].num==1||this.gridList1[i].num==3||this.gridList1[i].num==6||this.gridList1[i].num==7||this.gridList1[i].num==8){
+						this.gridList1[i].show=true
+					}
+				}
+			}else{
+				// console.log(33333333)
+				for (var i = 0; i < this.gridList1.length; i++) {
+					if(this.gridList1[i].num==0||this.gridList1[i].num==1||this.gridList1[i].num==3||this.gridList1[i].num==6||this.gridList1[i].num==7||this.gridList1[i].num==8){
+						this.gridList1[i].show=false
+					}
+				}
+			}
+			// console.log("uni.getStorageSync('compName1')")
 			// console.log(uni.getStorageSync("compName1"))
 			
 			// if (uni.getStorageSync("compName1")) {