gjy 2 years ago
parent
commit
b59bdf112c
2 changed files with 18 additions and 8 deletions
  1. 2 2
      config/index.js
  2. 16 6
      pages/dataReport/breakdownofprofit.vue

+ 2 - 2
config/index.js

@@ -4,13 +4,13 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 16 - 6
pages/dataReport/breakdownofprofit.vue

@@ -7,11 +7,15 @@
 			</view>
 			<view style='background:#fff;'>
 				<view class='contracttypewrap'>
-					<view :class='searchContractType==1?"active":""' class='item left'>销售</view>
-					<view :class='searchContractType==2?"active":""' class='item'>采购</view>
-					<view :class='searchContractType==5?"active":""' class='item'>收购</view>
-					<view :class='searchContractType==3?"active":""' class='item'>代收</view>
-					<view :class='searchContractType==4?"active":""' class='item right'>代储</view>
+					<view :class='agreementType=="销售合同"?"active":""' @click='contractclick("销售合同")' class='item left'>销售</view>
+					<view :class='agreementType=="采购合同"?"active":""' @click='contractclick("采购合同")' class='item'>采购
+					</view>
+					<view :class='agreementType=="收购合同"?"active":""' @click='contractclick("收购合同")' class='item'>收购
+					</view>
+					<view :class='agreementType=="代收合同"?"active":""' @click='contractclick("代收合同")' class='item'>代收
+					</view>
+					<view :class='agreementType=="代储合同"?"active":""' @click='contractclick("代储合同")' class='item right'>
+					代储</view>
 				</view>
 			</view>
 		</view>
@@ -53,7 +57,7 @@
 			return {
 				customBar: 0,
 				contractType: 1,
-				searchContractType: 1,
+				agreementType: '销售合同',
 				currentPage: 1,
 				pageSize: 10,
 				show: false,
@@ -123,6 +127,12 @@
 			// }
 		},
 		methods: {
+			contractclick(status) {
+				this.contractList=[]
+				this.currentPage = 1
+				this.agreementType = status
+				this.getList()
+			},
 			getList() {
 				uni.showLoading({
 					title: '数据加载中'