gjy 2 роки тому
батько
коміт
efd504e6fe

+ 2 - 2
config/index.js

@@ -1,10 +1,10 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	// baseUrlNew: 'http://192.168.110.67:9100/',
+	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/',

+ 12 - 3
pages/dataReport/Inventoryentrydetails.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class='search'>
-			<u-search v-model='searchKeyWord' placeholder='可按货源查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9'
-				:shape='"round"' :clearabled="true" :show-action='false'></u-search>
+			<u-search @custom='search' v-model='searchKeyWord' placeholder='可按货源查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9'
+				:shape='"round"' :clearabled="true" ></u-search>
 		</view>
 
 		<view style='justify-content: space-between;background:#fff;padding:20rpx;' class='flex'>
@@ -55,6 +55,7 @@
 				searchKeyWord: '',
 				warehouseList: [],
 				warehouseList1:[],
+				searchKeyWord:'',
 				isLoadMore: false
 			}
 		},
@@ -112,6 +113,13 @@
 			// }
 		},
 		methods: {
+			search(e){
+				this.searchKeyWord=e
+				this.show2=false
+				this.warehouseList=[]
+				this.currentPage=1
+				this.getList()
+			},
 			format(format) {
 				var o = {
 					"M+": this.getMonth() + 1, //month
@@ -159,7 +167,8 @@
 					compId: uni.getStorageSync('pcUserInfo').compId,
 					baseId: this.baseId,
 					startDate: this.startDate,
-					endDate: this.endDate
+					endDate: this.endDate,
+					searchKeyWord:this.searchKeyWord
 				}).then(res => {
 					if (res.data.code == 200) {
 

+ 12 - 3
pages/dataReport/breakdownofprofit.vue

@@ -2,8 +2,8 @@
 	<view>
 		<view class='fixedbox'>
 			<view class='search'>
-				<u-search placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'
-					:clearabled="true" :show-action='false'></u-search>
+				<u-search @custom='search' placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'
+					:clearabled="true"></u-search>
 			</view>
 			<view style='background:#fff;'>
 				<view class='contracttypewrap'>
@@ -61,6 +61,7 @@
 				agreementType: '销售合同',
 				currentPage: 1,
 				pageSize: 10,
+				searchKeyWord:'',
 				show: false,
 				contractList: []
 			}
@@ -128,6 +129,13 @@
 			// }
 		},
 		methods: {
+			search(e){
+				this.searchKeyWord=e
+				this.show=false
+				this.contractList=[]
+				this.currentPage=1
+				this.getList()
+			},
 			contractclick(status) {
 				this.show=false
 				this.contractList = []
@@ -140,9 +148,10 @@
 					title: '数据加载中'
 				})
 				this.$api.doRequest('get', '/contractManagementInfo/selectContractInfo', {
-					searchContractType: this.searchContractType,
+					agreementType: this.agreementType,
 					currentPage: this.currentPage,
 					pageSize: this.pageSize,
+					searchKeyWord:this.searchKeyWord,
 				}).then(res => {
 					if (res.data.code) {
 						uni.hideLoading()

+ 13 - 2
pages/dataReport/contractdetails/contractdetails.vue

@@ -2,8 +2,8 @@
 	<view>
 		<view class='fixedbox'>
 			<view class='search'>
-				<u-search placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'
-					:clearabled="true" :show-action='false'></u-search>
+				<u-search @custom='search' placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'
+					:clearabled="true" ></u-search>
 			</view>
 			<view style='background:#fff;'>
 				<view class='contracttypewrap'>
@@ -85,6 +85,7 @@
 				currentPage: 1,
 				pageSize: 10,
 				searchType: '',
+				searchKeyWord:'',
 				show: false,
 				contractList: []
 			}
@@ -152,16 +153,25 @@
 			// }
 		},
 		methods: {
+			search(e){
+				this.searchKeyWord=e
+				this.show=false
+				this.contractList=[]
+				this.currentPage=1
+				this.getList()
+			},
 			contractclick(status) {
 				this.show=false
 				this.currentPage = 1
 				this.agreementType = status
+				this.contractList=[]
 				this.getList()
 			},
 			searchTypeclick(status) {
 				this.show=false
 				this.currentPage = 1
 				this.searchType = status
+				this.contractList=[]
 				this.getList()
 			},
 			getList() {
@@ -175,6 +185,7 @@
 					currentPage: this.currentPage,
 					pageSize: this.pageSize,
 					searchType: this.searchType,
+					searchKeyWord:this.searchKeyWord,
 					appFlag: 1,
 				}).then(res => {
 					if (res.data.code) {