前端

components/mehaotian-search-revision.vue

@@ -4,10 +4,11 @@
 			<!-- HM修改 增加进入输入状态的点击范围 -->
 			<view class="content-box" @click="getFocus">
 				<text class="icon icon-serach"></text>
+					<input class="uni-input" focus placeholder="自动获得焦点" />
 				<!-- HM修改 增加placeholder input confirm-type confirm-->
-				<input :placeholder="placeholder" placeholder-style='font-size:28rpx' @input="inputChange"
-					confirm-type="search" @confirm="triggerConfirm" class="input" :focus="isFocus" v-model="inputVal"
-					@focus="focus" @blur="blur" />
+				<!-- <input ref='myInput' :placeholder="placeholder" placeholder-style='font-size:28rpx' @input="inputChange"
+					confirm-type="search" @confirm="triggerConfirm" class="input" focus  v-model="inputVal"
+					 @blur="blur" /> -->
 				<!-- <view v-if="!active && mode === 2" class="input sub" @click="getFocus">请输入搜索内容</view> -->
 				<!-- HM修改 @click换成@click.stop阻止冒泡 -->
 				<text v-if="isDelShow" class="icon icon-del" @click.stop="clear"></text>
@@ -62,7 +63,8 @@
 				inputVal: uni.getStorageSync('jiaoyikeyword')?uni.getStorageSync('jiaoyikeyword'):'',
 				searchName: '取消',
 				isDelShow: false,
-				isFocus: false
+				isFocus: false,
+				setfocus:false
 			};
 		},
 		watch:{
@@ -85,10 +87,12 @@
 				var keyword = event.detail.value;
 				this.$emit('input', keyword);
 				if (this.inputVal) {
+					console.log(33333)
 					this.isDelShow = true;
 				}
 			},
 			focus() {
+				console.log(222222)
 				this.active = true;
 				//HM修改 增加获取焦点判断
 				if (this.inputVal) {
@@ -114,8 +118,22 @@
 			},
 			getFocus() {
 				this.isFocus = true;
+			},
+			setFocus() {
+				uni.hideKeyboard()
+				this.$nextTick(() => {
+					// this.isFocus = true;
+				// 	console.log(this.$refs)
+				//     this.$refs.myInput.focus();
+				//                 // 加这一步是为了对Input没有成功聚焦情况的补救(渲染先后的关系)
+				                
+				})
+				
+				
+				
 			},
 			search() {
+				// console.log(11111)
 				//HM修改 增加点击取消时候退出输入状态，内容为空时，输入默认关键字
 				if (!this.inputVal) {
 					if (!this.show && this.searchName == '取消') {

components/search.vue

@@ -2,10 +2,11 @@
 	<view class="content">
 		<view class="search-box">
 			<!-- mSearch组件 如果使用原样式，删除组件元素-->
-			<mSearch ref='msearch' class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword"
-				@search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch>
+	<!-- 		<mSearch ref='msearch' class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword"
+				@search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
+				<input class="uni-input" focus placeholder="自动获得焦点" />
 			<view class="cancel" @click="cancel">
-				取消
+				取消11
 			</view>
 			<!-- 原样式 如果使用原样式，恢复下方注销代码 -->
 			<!-- 						
@@ -123,12 +124,11 @@
 				this.$emit('searchVal', '')
 			},
 			init() {
-				this.$refs.msearch.getFocus()
-				console.log(this.$refs.msearch)
 				this.loadDefaultKeyword();
 				this.loadOldKeyword();
 				this.loadHotKeyword();
-
+				console.log(1111)
+				// this.$refs.msearch.setFocus()
 			},
 			blur() {
 				uni.hideKeyboard()
@@ -217,7 +217,7 @@
 			},
 			//执行搜索
 			doSearch(keyword) {
-				keyword = keyword === false ? this.keyword : keyword;
+				keyword =(keyword === false ? this.keyword : keyword) ;
 				this.keyword = keyword;
 				this.saveKeyword(keyword); //保存为历史 
 				// uni.showToast({

components/selectAddress.vue

@@ -94,14 +94,14 @@
 			if(!this.edit&&!this.text){
 				this.place = this.searchPlace
 			}
-			console.log("this.series", this.series)
+			// console.log("this.series", this.series)
 			if (this.series == 3) {
 				this.addressCopy = JSON.parse(JSON.stringify(address1))
 				this.addressCopy.shift()
 			} else {
 				this.addressCopy = JSON.parse(JSON.stringify(address))
 			}
-			console.log("this.addressCopy", this.addressCopy)
+			// console.log("this.addressCopy", this.addressCopy)
 			for (let i = 0; i < this.addressCopy.length; i++) {
 				this.multiArray[0].push(this.addressCopy[i])
 

pages.json

@@ -1705,6 +1705,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/business/search",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "搜索",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subpackages": [{
 			"root": "pageA",

pages/business/businessNew.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<!-- <input class="uni-input" focus placeholder="自动获得焦点" /> -->
 		<view v-if="!isShowSearch">
 			<view class="top-warp">
 				<view class="search">
@@ -105,14 +106,14 @@
 				:content-style="contentStyle"  @confirm="cancelFollow" @cancel="show=false">
 			</u-modal>
 		</view>
-		<search  :searchcontent='keyword1' v-if="isShowSearch" @searchVal='searchVal'></search>
+		<!-- <search v-show="isShowSearch" @searchVal='searchVal'></search> -->
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			 content="尚未登录,是否立即登录" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
-		<u-modal v-model="isSHowReleaseAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+	<!-- 	<u-modal v-model="isSHowReleaseAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400','text-align':'left'}" confirm-color='#22C572'
 			confirm-text='我知道了' title='温馨提示' content="交易信息为用户自由发布，正式签订合同前切勿进行任何付款操作，以免给您的财产造成损失。"
-			@confirm="releaseAlertbtn"></u-modal>
+			@confirm="releaseAlertbtn"></u-modal> -->
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -149,10 +150,13 @@
 					"font-weight": 700
 				},
 				isShowSearch: false,
-				selectItem: {},
+				selectItem: {
+					followInformation:{
+						id:''
+					}
+				},
 				show: false,
 				keyword: '',
-				keyword1: '',
 				inputStyle: {
 					// "padding-left": '30rpx'
 				},
@@ -188,14 +192,33 @@
 					name: '关注',
 					type: 'xx'
 				}],
+				
+				tabbar: true,
+				windowHeight: '',
 				tabIndex: 0 // tab下标
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'clientId']),
 		},
-
+		onLoad() {
+		    uni.getSystemInfo({
+		        success: (res)=> {
+		            this.windowHeight = res.windowHeight;
+		        }
+		    });    
+		    uni.onWindowResize((res) => {
+		        if(res.size.windowHeight < this.windowHeight){
+		            uni.hideTabBar()
+		        }else{
+		            uni.showTabBar()
+		        }
+		    })
+		},
 		onShow() {
+			if(uni.getStorageSync('jiaoyikeyword')){
+				this.keyword=uni.getStorageSync('jiaoyikeyword')
+			}
 			let _tl = uni.getStorageSync('transactionLocation')
 			if (_tl) {
 				this.searchPlace = _tl.showVal
@@ -204,7 +227,7 @@
 
 			}
 			this.isSHowReleaseAlert = getApp().globalData.userRelease
-			console.log("this.isSHowReleaseAlert", this.isSHowReleaseAlert)
+			// console.log("this.isSHowReleaseAlert", this.isSHowReleaseAlert)
 			uni.showTabBar()
 			uni.hideKeyboard()
 			var userInfo = uni.getStorageSync("userInfo")
@@ -249,7 +272,6 @@
 			});
 
 		},
-		onLoad(options) {},
 		onNavigationBarButtonTap(e) {
 			console.log(e)
 			if (!this.hasLogin) {
@@ -269,7 +291,6 @@
 				this.mescroll.resetUpScroll()
 			},
 			previewImage(item, index) {
-				console.log(111111111)
 				var i = item.imgList; //获取当前页面的轮播图数据
 				//uniapp预览轮播图
 				uni.previewImage({
@@ -309,17 +330,14 @@
 					url: '/pages/public/login'
 				})
 			},
-			searchVal(e) {
-				console.log(e)
-				this.isShowSearch = false
-				this.keyword = e
-			},
+			
 			toSearch() {
-
-				this.keyword1 = this.keyword
 				uni.setStorageSync('jiaoyikeyword', this.keyword)
 				uni.setStorageSync('jiaoyifocus', true)
-				this.isShowSearch = true
+				// this.isShowSearch = true
+				uni.navigateTo({
+					url:'/pages/business/search'
+				})
 			},
 			follow(val, type) {
 				// 2关注

pages/oa_office/the_oaOffice.vue

@@ -106,7 +106,7 @@
 			}
 		},
 		onShow() {
-			// uni.hideKeyboard()
+			uni.hideKeyboard()
 			// uni.showTabBar()
 			// this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 			// 	console.log("checkSession", res)

pages/reimbursement/addaccessory.vue

@@ -91,8 +91,8 @@
 			<view style="display: flex;flex-wrap: wrap;">
 				<view v-for='(item,index) in imglist2' v-if="imglist2 && imglist2.length > 0"
 					style="position: relative;margin-left: 20rpx;">
-					{{length}}
-					<view v-if='length>index+1' class="delete_img" @click="deleteImg(index)">X</view>
+					
+					<view v-if='length<index+1' class="delete_img" @click="deleteImg(index)">X</view>
 					<image :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image>
 				</view>
 				<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 30">
@@ -388,28 +388,6 @@
 				})
 			},
 			submit() {
-				if (!this.detailData.purpose) {
-					this.$api.msg('用途不能为空')
-					return
-				}
-				if (!this.detailData.warehouseName && this.detailData.purpose == '库点费用') {
-					this.$api.msg('请选择仓库名称')
-					return
-				}
-				if (!this.detailData.contractNo && this.detailData.purpose == '合同费用') {
-					this.$api.msg('请选择合同编号')
-					return
-				}
-				if (this.expensesType == '2') {
-					if(!this.detailData.payerHeader){
-						this.$api.msg('付款方不能为空')
-						return
-					}
-				}
-				if (!this.detailData.amountMoney) {
-					this.$api.msg('金额不能为空')
-					return
-				}
 				var that = this
 				var title
 				var theInterface
@@ -418,33 +396,21 @@
 				} else {
 					title = "确定提交请款信息？"
 				}
-				if (that.id) {
-					theInterface = '/expenseInfo/editInfo'
-					that.detailData.id = that.id
-				} else {
-					theInterface = '/expenseInfo/api/addInfo'
-				}
 				uni.showModal({
-					content: title,
+					content: '确定提交附件信息？',
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
-							that.detailData.agent = uni.getStorageSync('userInfo').userName
-							that.detailData.identification = that.detailData.identification
-							that.detailData.costType = that.detailData.costType
-							that.detailData.expensesType = that.reType
-							that.detailData.fieldName = uni.getStorageSync('userInfo').userName
-							that.detailData.totalDistribution = that.detailData.totalDistribution
-							if (that.imglist.length > 0) {
-								that.detailData.addressUrl = that.imglist.toString()
+							var obj={
+								id:that.id,
+								addressUrl: that.imglist.toString()
 							}
 							uni.showLoading({
 								title: "加载中",
 								mask: true
 							})
-							that.$api.doRequest('post', theInterface, that.detailData)
+							that.$api.doRequest('post', '/expenseInfo/uploadAttachments', obj)
 								.then(res => {
 									if (res.data.code == 200) {
 										uni.hideLoading()
@@ -468,7 +434,7 @@
 					if (res.data.code == 200) {
 						this.detailData = res.data.data
 						this.imglist = this.detailData.addressUrl.split(',')
-						this.length=this.detailData.addressUrl.split(',').length
+						this.length=JSON.parse(JSON.stringify(this.detailData.addressUrl.split(',').length))
 					}
 				})
 			},

pages/reimbursement/the_reimbursement.vue

@@ -42,7 +42,7 @@
 						v-if="item.status=='已驳回'">删除</view>
 					<view class="wenzi1 audit" @click="requestFunds(3,item)"
 						v-if="item.status=='已驳回'">编辑</view>
-						<!-- <view class="wenzi1 audit" @click="gofujian(item)">补充附件</view> -->
+						<view class="wenzi1 audit" @click="gofujian(item)">补充附件</view>
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
 			</view>

pages/task/audit/freight_settlement_detailscopy.vue

@@ -315,7 +315,9 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataobj = res.data.data
-						this.imglist = this.dataobj.freightAddressUrl.split(',')
+						if(this.dataobj.freightAddressUrl){
+							this.imglist = this.dataobj.freightAddressUrl.split(',')
+						}
 						if (res.data.data.tranTaskInfoList.length > 0) {
 							this.num = 0
 							for (var i = 0; i < res.data.data.tranTaskInfoList.length; i++) {