15:58

pages/assay/assayDetails.vue

@@ -97,7 +97,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.container {
 		height: 100vh;
 		background: rgb(243, 244, 249);

pages/assay/deptList.vue

@@ -212,7 +212,11 @@
 						setTimeout(() => {
 							this.assList = []
 							this.checkboxValue1 = []
+							uni.$emit('query', {
+								a: 'one'
+							})
 							uni.navigateBack()
+
 						}, 1000)
 					})
 				}
@@ -245,7 +249,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.container {
 		height: 100rpx;
 	}

pages/assay/detailsList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<view style="margin-top: 15rpx;" class="content-header">
-			<view v-for="item in ledgerList" style="margin-bottom: 30rpx;" class="">
+		<view v-for="item in ledgerList" style="margin-top: 15rpx;" class="content-header">
+			<view class="">
 				<view style="justify-content: space-between; " class="content">
 					<view style="color:black;font-size: 36rpx;font-weight: 700;" class="message">
 						{{item.miInstrument.name}}
@@ -10,7 +10,6 @@
 					  color: recordColor[recordStatus(item.miInstrument.fillingStatus)],
 					}">{{ recordStatus(item.miInstrument.fillingStatus) }}</view>
 				</view>
-
 				<view style="display: flex;" class="content">
 					<view class="title">唯一标识：<span class="message">{{item.miInstrument.instrNo}}
 						</span>
@@ -20,7 +19,6 @@
 					<view class="title">器具用途：</view>
 					<view class="message">{{item.miInstrument.purposeName}}</view>
 				</view>
-
 				<view class="content">
 					<view class="title">制造单位：</view>
 					<view class="message">{{item.miInstrument.manufactoryName}}</view>
@@ -49,12 +47,11 @@
 						<view class="message">{{item.miInstrument.internalNumber}}</view>
 					</view>
 				</view>
-
 			</view>
 		</view>
 		<view style="display: flex;" class="submitBtn">
 			<u-button @click="downLoadPDF" type="primary" style="margin: 0 auto; width:47%">备案申请单PDF下载</u-button>
-			<u-button @click="chehui" type="error" style="margin: 0rpx auto; width: 47%">撤回</u-button>
+			<u-button v-if="showChehui" @click="chehui" type="error" style="margin: 0rpx auto; width: 47%">撤回</u-button>
 		</view>
 		<u-modal :show="show" :showCancelButton='true' @cancel="show=false" @confirm="handleGD" title="提示"
 			content='确认要撤回此备案单吗？'></u-modal>
@@ -90,6 +87,7 @@
 				ledgerList: [],
 				total: 0,
 				record: [],
+				showChehui: true,
 				queryParams: {
 					pageNum: 1,
 					pageSize: 10,
@@ -110,6 +108,9 @@
 				this.ledgerList = res.rows;
 				this.total = res.total;
 			})
+			if (this.ledgerList[0].miInstrument.fillingStatus == '7') {
+				this.showChehui = false
+			}
 		},
 		computed: {
 			// //检定状态
@@ -137,7 +138,9 @@
 
 			},
 			handleGD() {
-				backAudit().then((res) => {
+				backAudit({
+					applyId: this.queryParams.auditOrderApplyId
+				}).then((res) => {
 					uni.showToast({
 						title: "撤回成功",
 						icon: "none",
@@ -190,7 +193,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.submitBtn {
 		width: 100%;
 		background: #fff;

pages/assay/equipmentDetails.vue

@@ -171,7 +171,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.container {
 		height: 100vh;
 		background: rgb(243, 244, 249);

pages/assay/index.vue

@@ -170,7 +170,15 @@
 			}, 1000);
 		},
 		onShow() {
-			// this.getList()
+			uni.$once('query', (query) => {
+				if (query.a == 'one') {
+					this.queryParams.pageNum = 1
+					this.queryParams.pageSize = 10
+					this.getList()
+					uni.startPullDownRefresh();
+				}
+			})
+
 		},
 		computed: {
 			// //检定状态