8.23bug修改

pages/device/EquipmentArchives/EquipmentArchives.vue

@@ -1,8 +1,13 @@
 <template>
 	<view>
+		<!-- <view>
+			<u-navbar title="个人中心" @rightClick="rightClick" :autoBack="true" ></u-navbar>
+		</view> -->
 		<view class="searchforBox">
 			<view style="display: flex;align-items: center;">
-				<u-search :showAction="true" actionText="搜索" clearabled :animation="true" @search="searchfun" @clear="clearfun"></u-search>
+				<u-search v-model="page.corpName" :showAction="true" actionText="搜索"
+				clearabled :animation="false" 
+				@search="searchfun" @custom="searchfun" @clear="clearfun"></u-search>
 				<view class="addbox" @click="Jumpfun()">添加档案</view>
 			</view>
 <!-- 			<view class="screenflex">
@@ -12,7 +17,7 @@
 			</view> -->
 		</view>
 		<view class="listbox">
-			<view class="cardBox" v-for="item in listData" :key="item.id" @click="Jumpfun(item.id)">
+			<view class="cardBox" v-for="(item,index) in listData" :key="index" @click="Jumpfun(item.id)">
 				<view class="listbox_title">
 					<view class="listbox_titleLeft">
 						<!-- <u-icon name="bookmark-fill" color="#215476" size="22"></u-icon> -->
@@ -79,6 +84,9 @@
 			},
 			// 搜索
 			searchfun(value)	{
+				this.listData = []
+				this.page.current = 1
+				this.page.size = 10
 				this.page.corpName = value
 				this.corpequipmentarchivesListfun()
 			},

pages/device/FileDetails/FileDetails.vue

@@ -300,7 +300,7 @@
 						</u--input>
 					</view> -->
 					<view class="inputbox" style="margin-top: 20rpx;">
-						<view class="shebetext">图片:</view>
+						<!-- <view class="shebetext">图片:</view> -->
 						<u-upload :fileList="item.filesList" @afterRead="afterRead($event,2,index)"
 							@delete="deletePic($event,2,index)" name="1" multiple :maxCount="10"></u-upload>
 					</view>
@@ -357,7 +357,6 @@
 					<!-- <u-icon name="file-text" color="#101010" size="22"></u-icon> -->
 					<view style="font-size: 30rpx;
 					 width: 150rpx; 
-					 height: 44rpx; 
 					 background-color: #FD4B09; 
 					 border-radius:44rpx; 
 					 color: #fff;
@@ -817,6 +816,10 @@
 					id: this.id
 				}).then(res => {
 					this.form = res.data
+					this.form.corpEquipmentArchivesItemList.map(item=>{
+						item.maintenanceDate = item.maintenanceDate.slice(0,10)
+						item.exitDate = item.exitDate.slice(0,10)
+					})
 				})
 			},
 

pages/device/RepairDetails/RepairDetails.vue

@@ -166,7 +166,9 @@
 			<view class="kapian" >
 				<view class="wxtitleflex">
 					<view class="wxtitle">添加费用</view>
-					<view v-if="form.status == 3 && type != 'XQ'" style="color: #fff; background-color: #FD4B09;" class="addwx" @click="kapianShow = true">添加</view>
+					<view v-if="form.status == 3 && userInfoRoleName.indexOf('admin') != -1" 
+					style="color: #fff; background-color: #FD4B09;" class="addwx" 
+					@click="kapianShow = true">添加</view>
 				</view>
 			</view>
 		</view>
@@ -256,7 +258,7 @@
 		data() {
 			return {
 				id:null,
-				wxStyle: '',
+				wxStyle: '#fd4b09',
 				gzStyle: '',
 				overlayShow: false,
 				form:{
@@ -340,7 +342,7 @@
 					// this.form.status = 2
 					
 				} else if (type == "gz") {
-					if (this.form.dispatchingWorkers == 2) return
+					if (this.form.dispatchingWorkers == 1) return
 					this.gzStyle = "#fd4b09"
 					this.wxStyle = ""
 					// this.form.status = 3
@@ -545,7 +547,7 @@
 					
 					for (let index in this.form.maintenanceFiles) {
 						if(this.form.maintenanceFiles[index].uploadType == 0) {
-							this.userImgList.push(img)
+							this.userImgList.push(this.form.maintenanceFiles[index])
 							this.form.maintenanceFiles.splice(index, 1)
 						}
 					}