汽保

pages.json

@@ -91,7 +91,10 @@
 			"style": {
 				"navigationBarTitleText": "设备档案",
 				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 
 		}, {

pages/device/EquipmentArchives/EquipmentArchives.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view style="margin-bottom: 90rpx;">
+		<view style="height:170rpx">
 			<u-navbar title="设备档案" bgColor="#fd4b09" leftIconColor="#fff" leftIconSize="27px"
 			:titleStyle="{'color':'#fff'}" :autoBack="true" >
 				<view class="u-nav-slot" slot="right" >
@@ -10,7 +10,7 @@
 		</view>
 		<view class="searchforBox">
 			<view style="display: flex;align-items: center;">
-				<u-search v-model="page.corpName" :showAction="true" actionText="搜索"
+				<u-search v-model="page.retrieval" :showAction="true" actionText="搜索"
 				clearabled :animation="false" 
 				@search="searchfun" @custom="searchfun" @clear="clearfun"></u-search>
 				<!-- <view class="addbox" @click="Jumpfun()">添加档案</view> -->
@@ -97,7 +97,7 @@
 				this.listData = []
 				this.page.current = 1
 				this.page.size = 10
-				this.page.corpName = value
+				this.page.retrieval = value
 				this.corpequipmentarchivesListfun()
 			},
 			// 搜索清空
@@ -105,7 +105,7 @@
 				this.listData = []
 				this.page.current = 1
 				this.page.size = 10
-				this.page.corpName = ''
+				this.page.retrieval = ''
 				this.corpequipmentarchivesListfun()
 			},
 			// 获取设备档案列表

pages/device/FileDetails/FileDetails.vue

@@ -589,12 +589,12 @@
 			// 保存数据接口
 			corpequipmentarchivesSubmitfun(obj) {
 				corpequipmentarchivesSubmit(obj).then(res => {
+					this.loading = false
 					if (res.code == 200) {
 						this.$refs.uToast.show({
 							type: 'success',
 							message: '操作成功',
 						})
-						this.loading = false
 						this.form = res.data
 						this.form.corpEquipmentArchivesItemList.map(item=>{
 							item.exitDate = item.exitDate ? item.exitDate.slice(0,10) : null

pages/device/RepairDetails/RepairDetails.vue

@@ -42,8 +42,6 @@
 					border="none" >
 				</u--textarea>
 			</view>
-			
-						
 			<view class="kapian">
 				<!-- <view style="font-size: 30rpx;color: #999;margin-left: 10rpx;">添加图片</view> -->
 				<view style="margin-top: 20rpx;">
@@ -124,9 +122,10 @@
 					</template> -->
 				</u-input>
 			</view>
-			
 			<view class="cardBox">
-				<u--textarea v-model="form.repairDescription" placeholder="维修描述" border="none" :disabled="form.status != 3" >
+				<u--textarea v-model="form.repairDescription"
+				 placeholder="维修描述" border="none" 
+				 :disabled="userInfoRoleName.indexOf('admin') != -1?form.status != 2:form.status != 3" >
 				</u--textarea>
 			</view>
 			
@@ -135,7 +134,7 @@
 				<view style="margin-top: 20rpx;">
 					<u-upload
 						:fileList="form.maintenanceFiles"
-						 :disabled="form.status != 3"
+						 :disabled="userInfoRoleName.indexOf('admin') != -1?form.status != 2:form.status != 3"
 						@afterRead="afterRead"
 						@delete="deletePic"
 						name="1"
@@ -165,11 +164,11 @@
 				</view>
 			</view>
 			
-			
 			<view class="kapian" >
 				<view class="wxtitleflex">
 					<view class="wxtitle">添加费用</view>
-					<view v-if="form.status == 3 || userInfoRoleName.indexOf('admin') != -1" 
+					<!-- form.status == 3 || userInfoRoleName.indexOf('admin') != -1 -->
+					<view v-if="userInfoRoleName.indexOf('admin') == -1?form.status != 4:form.status != 3" 
 					style="color: #fff; background-color: #FD4B09;" class="addwx" 
 					@click="kapianShow = true">添加</view>
 				</view>
@@ -599,9 +598,12 @@
 			},
 			// 确认结算
 			ConfirmSettlement(){
-				this.overlayShow = true;
-				this.overlayShow = false;
+				// this.overlayShow = true;
 				
+				// this.overlayShow = false;
+				this.$refs.uToast.show({
+					message: "功能暂未开启，请耐心等待"
+				})
 			},
 			// 确认接单接口
 			receivingOrdersfun(){
@@ -629,13 +631,18 @@
 				maintenanceDetail({id:this.id}).then(res=>{
 					this.form = res.data
 					
-					
+					let arr1 = []
+					let arr2 = []
 					for (let index in this.form.maintenanceFiles) {
 						if(this.form.maintenanceFiles[index].uploadType == 0) {
-							this.userImgList.push(this.form.maintenanceFiles[index])
-							this.form.maintenanceFiles.splice(index, 1)
-						}
+							arr1.push(this.form.maintenanceFiles[index])
+						}else{
+							arr2.push(this.form.maintenanceFiles[index])
+						} 
 					}
+					this.userImgList = arr1;
+					this.form.maintenanceFiles = arr2;
+					
 					if (this.form.status == 4) {
 						this.gzStyle = "#fd4b09"
 						this.wxStyle = ""

pages/device/RepairReportList/RepairReportList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="searchforBox">
-			<u-search v-model="page.corpName" :showAction="true" actionText="搜索"
+			<u-search v-model="page.retrieval" :showAction="true" actionText="搜索"
 			clearabled :animation="false" 
 			@search="searchfun" @custom="searchfun" @clear="clearfun"></u-search>
 		</view>
@@ -133,7 +133,7 @@
 				this.Datalist = []
 				this.page.current = 1
 				this.page.size = 10
-				this.page.corpName = value
+				this.page.retrieval = value
 				this.maintenanceListfun()
 			},
 			// 搜索清空
@@ -141,7 +141,7 @@
 				this.Datalist = []
 				this.page.current = 1
 				this.page.size = 10
-				this.page.corpName = ''
+				this.page.retrieval = ''
 				this.maintenanceListfun()
 			},
 			cardBoxClick(item) {

pages/views/bluetooth/salesSlipTable.vue

@@ -42,7 +42,8 @@
 				<td colspan="4">订货电话:{{form.clientAttn}}</td>
 			</tr>
 			<tr>
-				<td colspan="2">制单人:{{form.client}}</td>
+				<!-- <td colspan="2">制单人:{{form.client}}</td> -->
+				<td colspan="2">制单人:{{userInfoName}}</td>
 				<td colspan="2">收货人(签字):</td>
 			</tr>
 		</table>
@@ -58,11 +59,13 @@
 			return {
 				form:{},
 				amountNumber:{},
-				tenantName:''
+				tenantName:'',
+				userInfoName:'',
 			}
 		},
 		onLoad(options) {
 			this.tenantName = uni.getStorageSync('information').tenantName
+			this.userInfoName = uni.getStorageSync('userInfo').account
 			this.form = JSON.parse(options.data)
 			this.amountNumber = {
 				deliveryAll: 0, //送货总数量