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

pages/erpbusiness/add_quality_testing.vue

@@ -898,7 +898,7 @@
 				// this.taskNolist=res.data.data
 			})
 			if (uni.getStorageSync('checkcustomer')) {
-
+console.log(11111111)
 				let _customerInfo = uni.getStorageSync('checkcustomer')
 				if (_customerInfo.shipperName) {
 					this.gridList.identityId = _customerInfo.id

pages/erpbusiness/quality_testing.vue

@@ -271,6 +271,7 @@
 						that.warehouseTradeCount = that.selector[0].tradeCount
 						that.commonWarehouseNo = that.selector[0].commonWarehouseNo
 						that.cangid = that.selector[0].id
+						uni.setStorageSync("cangid", that.cangid)
 						// uni.setStorageSync('purchasePriceList',that.selector[0].purchasePriceList)
 					}
 					this.getList(true)

pages/universalityAudit/list.vue

@@ -24,6 +24,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -36,6 +39,9 @@
 		onShow(){
 			this.getList()
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo','clientId']),
+		},
 		onReachBottom() { //上拉触底函数
 			// if (this.statusFlag == 3) {
 				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
@@ -67,7 +73,8 @@
 					currentPage: this.currentPage,
 					pageSize:this.pageSize,
 					searchType: '',
-					businessType: ''
+					businessType: '',
+					createUserId:this.userInfo.id
 				}).then(res => {
 					if(res.data.code==200){
 						uni.hideLoading()

pages/user/newReport.vue

@@ -139,7 +139,7 @@
 						@click="foldClcik(['fade', 'slide-top'],3)">
 					</u-icon>
 				</view>
-				<view class="right-btn">
+				<view @click='goToPage(5)' class="right-btn">
 					库存明细
 				</view>
 			</view>
@@ -635,6 +635,12 @@
 			this.getServerData();
 		},
 		methods: {
+			goToPage(index) {
+
+					uni.navigateTo({
+						url: '/pages/user/contractLook/inventoryCost?searchMonth=' + this.seachMoth
+					})
+			},
 			clickNav(index) {
 				this.carIndex = index
 				let _data = ""

pages/user/setUp.vue

@@ -326,8 +326,10 @@
 				uni.hideTabBarRedDot({
 					index: 3
 				})
+				uni.setStorageSync("cangid",'')
 				// uni.clearStorageSync();
 				var that = this
+				
 				this.$api.doRequest('post', '/auth/api/logout').then(res => {
 					if (res.data.data) {