Merge branch 'master' of http://121.28.134.38:2039/wxd/jiliangxiaochengxu into wxd

config.js

@@ -2,28 +2,27 @@
 
 // 应用全局配置
 module.exports = {
-  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  baseUrl: "http://192.168.1.21:8081",
-  // 应用信息
-  appInfo: {
-    // 应用名称
-    name: "ruoyi-app",
-    // 应用版本
-    version: "1.1.0",
-    // 应用logo
-    logo: "/static/logo.png",
-    // 官方网站
-    site_url: "http://ruoyi.vip",
-    // 政策协议
-    agreements: [
-      {
-        title: "隐私政策",
-        url: "https://ruoyi.vip/protocol.html",
-      },
-      {
-        title: "用户服务协议",
-        url: "https://ruoyi.vip/protocol.html",
-      },
-    ],
-  },
-};
+	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
+	baseUrl: "http://192.168.1.42:8081",
+	// 应用信息
+	appInfo: {
+		// 应用名称
+		name: "ruoyi-app",
+		// 应用版本
+		version: "1.1.0",
+		// 应用logo
+		logo: "/static/logo.png",
+		// 官方网站
+		site_url: "http://ruoyi.vip",
+		// 政策协议
+		agreements: [{
+				title: "隐私政策",
+				url: "https://ruoyi.vip/protocol.html",
+			},
+			{
+				title: "用户服务协议",
+				url: "https://ruoyi.vip/protocol.html",
+			},
+		],
+	},
+};

pages/assay/application.vue

@@ -1,16 +1,115 @@
 <!-- @format -->
 
 <template>
-  <view class="app-container"> </view>
+	<view class="">
+		<view class="app-container">
+			<view style="background-color: #fff;padding:20rpx;border-radius: 10rpx;" class="">
+				<view style="height: 350rpx" class="content-header">
+					<u-checkbox-group style="margin-top: 20rpx" v-model="checkboxValue1" placement="column"
+						@change="checkboxChange">
+						<u-checkbox style="color: red" v-for="item in checkBoxList" :key="item" :label="item.name"
+							:name="item.label">
+						</u-checkbox>
+					</u-checkbox-group>
+				</view>
+				<span style="color:red;margin-left: 40rpx;font-size: 32rpx;">提交前，请认真阅读理解自我承诺内容后勾选</span>
+
+			</view>
+
+		</view>
+		<view class="submitBtn" style="display: flex;">
+			<u-button @click="backPage" style="width: 45%; margin: 0 auto" type="success">上一步</u-button>
+			<u-button @click="submitBeian" style="width: 45%; " type="primary">提交</u-button>
+		</view>
+	</view>
+
 </template>
 
 <script>
-export default {};
+	import {
+		addMiAuditOrder
+	} from "@/api/assay.js";
+	export default {
+		data() {
+			return {
+				checkboxValue1: [],
+				assList: [],
+				ids: '',
+				checkBoxList: [{
+					name: "我单位承诺，本次提交备案的计量器具的相关信息均真实准确，经过自我严格审核，均符合《市场监管总局关于调整实施强制管理的计量器具目录的公告》（国家市场监督管理总局公告2020年第42号)中《实施强制管理的计量器具目录》的规定。",
+					label: false,
+				}, ],
+			}
+		},
+		onLoad(options) {
+			this.ids = options.ids
+		},
+		methods: {
+			backPage() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			submitBeian() {
+				if (this.checkboxValue1.length == 0) {
+					this.$modal.showToast("提交前，请认真阅读理解自我承诺内容后勾选");
+				} else {
+					// let ids = this.assList.map((item) => item.id).join(",");
+					// console.log("ids", ids);
+					addMiAuditOrder({
+						instrumentIds: this.ids,
+					}).then((res) => {
+						console.log("res", res);
+						uni.showToast({
+							title: "新增成功",
+							icon: "none",
+							duration: 2000,
+						});
+
+						setTimeout(() => {
+							this.assList = [];
+							this.checkboxValue1 = [];
+							uni.$emit("query", {
+								a: "one",
+							});
+							uni.navigateTo({
+								url: "/pages/assay/index",
+							})
+						}, 500);
+					});
+				}
+			},
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.app-container {
-  height: 100vh;
-  background: rgb(243, 244, 249);
-}
-</style>
+	::v-deep .u-checkbox {
+		display: flex;
+		flex-direction: row;
+		/* overflow: hidden; */
+		flex-direction: row;
+		align-items: flex-start;
+	}
+
+	::v-deep uni-text[data-v-c4a74aee] span {
+		font-size: 30rpx;
+		// color: red;
+		line-height: 50rpx;
+	}
+
+	.app-container {
+		height: 100vh;
+		background: rgb(243, 244, 249);
+		padding: 20rpx
+	}
+
+	.submitBtn {
+		width: 100%;
+		background: #fff;
+		padding: 15rpx 0;
+		position: fixed;
+		bottom: 0;
+		z-index: 9999;
+	}
+</style>

pages/assay/deptList.vue

@@ -1,402 +1,371 @@
 <!-- @format -->
 
 <template>
-  <view class="container">
-    <view style="margin-top: 15rpx; padding-bottom: 110rpx">
-      <view style="font-size: 30rpx" class="content-header">
-        <view class="content">
-          <view style="font-size: 30rpx" class="title">申请单位</view>
-          <view>{{ danwei }}</view>
-        </view>
-        <view class="content">
-          <view style="font-size: 30rpx" class="title">申请人</view>
-          <view>{{ applyPeople }}</view>
-        </view>
+	<view class="container">
+		<view style="margin-top: 15rpx; padding-bottom: 110rpx">
+			<view style="font-size: 30rpx" class="content-header">
+				<view class="content">
+					<view style="font-size: 30rpx" class="title">申请单位</view>
+					<view>{{ danwei }}</view>
+				</view>
+				<view class="content">
+					<view style="font-size: 30rpx" class="title">申请人</view>
+					<view>{{ applyPeople }}</view>
+				</view>
 
-        <view class="content">
-          <view style="font-size: 30rpx" class="title">联系电话</view>
-          <view>{{ userMobile }}</view>
-        </view>
-      </view>
-      <view class="">
-        <u-swipe-action
-          ref="swipeAction"
-          v-for="(item, index) in assList"
-          :key="index"
-          style="margin: 20rpx; border-radius: 10rpx; overflow: hidden"
-        >
-          <u-swipe-action-item
-            ref="item"
-            @click="shanchu(item)"
-            :options="options2"
-          >
-            <view
-              style="
+				<view class="content">
+					<view style="font-size: 30rpx" class="title">联系电话</view>
+					<view>{{ userMobile }}</view>
+				</view>
+			</view>
+			<view class="">
+				<u-swipe-action ref="swipeAction" v-for="(item, index) in assList" :key="index"
+					style="margin: 20rpx; border-radius: 10rpx; overflow: hidden">
+					<u-swipe-action-item ref="item" @click="shanchu(item)" :options="options2">
+						<view style="
                 border-radius: 10rpx;
                 background-color: #fff;
                 padding: 10rpx;
-              "
-            >
-              <view class="">
-                <view style="margin-top: 15rpx" class="content-header1">
-                  <view style="margin-bottom: 30rpx" class="">
-                    <view
-                      style="justify-content: space-between"
-                      class="content"
-                    >
-                      <view
-                        style="color: black; font-size: 36rpx; font-weight: 700"
-                        class="message"
-                      >
-                        {{ item.name }}
-                      </view>
-                      <view
-                        style="padding-top: 5rpx"
-                        :style="{
+              ">
+							<view class="">
+								<view style="margin-top: 15rpx" class="content-header1">
+									<view style="margin-bottom: 30rpx" class="">
+										<view style="justify-content: space-between" class="content">
+											<view style="color: black; font-size: 36rpx; font-weight: 700"
+												class="message">
+												{{ item.name }}
+											</view>
+											<view style="padding-top: 5rpx" :style="{
                           color: recordColor[recordStatus(item.fillingStatus)],
-                        }"
-                        >{{ recordStatus(item.fillingStatus) }}</view
-                      >
-                    </view>
+                        }">{{ recordStatus(item.fillingStatus) }}</view>
+										</view>
 
-                    <view style="display: flex" class="content">
-                      <view class="title"
-                        >唯一标识：<span class="message">
-                          {{ item.instrNo }}
-                        </span>
-                      </view>
-                    </view>
-                    <view style="display: flex" class="content">
-                      <view class="title">器具用途：</view>
-                      <view class="message">
-                        {{ item.purposeName }}
-                      </view>
-                    </view>
+										<view style="display: flex" class="content">
+											<view class="title">唯一标识：<span class="message">
+													{{ item.instrNo }}
+												</span>
+											</view>
+										</view>
+										<view style="display: flex" class="content">
+											<view class="title">器具用途：</view>
+											<view class="message">
+												{{ item.purposeName }}
+											</view>
+										</view>
 
-                    <view class="content">
-                      <view class="title">制造单位：</view>
-                      <view class="message">
-                        {{ item.manufactoryName }}
-                      </view>
-                    </view>
-                    <view
-                      style="display: flex; justify-content: space-between"
-                      class=""
-                    >
-                      <view style="display: flex" class="content">
-                        <view class="title">器具类型：</view>
-                        <view class="message">
-                          {{ item.typeName }}
-                        </view>
-                      </view>
-                      <view
-                        style="display: flex; align-items: center"
-                        class="content"
-                      >
-                        <view class="title">规格型号：</view>
-                        <view style="padding-top: 5rpx" class="message">
-                          {{ item.modelSpecific }}
-                        </view>
-                      </view>
-                    </view>
-                    <view
-                      style="display: flex; justify-content: space-between"
-                      class=""
-                    >
-                      <view style="display: flex" class="content">
-                        <view class="title">出厂编号：</view>
-                        <view style="padding-top: 5rpx" class="message">
-                          {{ item.serialNumber }}
-                        </view>
-                      </view>
-                      <view
-                        style="display: flex; align-items: center"
-                        class="content"
-                      >
-                        <view class="title">内部编号：</view>
-                        <view class="message">
-                          {{ item.internalNumber }}
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </u-swipe-action-item>
-        </u-swipe-action>
-      </view>
-      <view style="height: 270rpx" class="content-header">
-        <u-checkbox-group
-          style="margin-top: 20rpx"
-          v-model="checkboxValue1"
-          placement="column"
-          @change="checkboxChange"
-        >
-          <u-checkbox
-            style="color: red"
-            v-for="item in checkBoxList"
-            :key="item"
-            :label="item.name"
-            :name="item.label"
-          >
-          </u-checkbox>
-        </u-checkbox-group>
-      </view>
-    </view>
-    <view class="submitBtn" style="display: flex">
-      <u-button
-        @click="qingkong"
-        style="width: 47%; margin: 0 auto"
-        type="warning"
-        >清空</u-button
-      >
-      <u-button
-        @click="submitBeian"
-        style="width: 47%; margin: 0 auto"
-        type="success"
-        >提交</u-button
-      >
-    </view>
-  </view>
+										<view class="content">
+											<view class="title">制造单位：</view>
+											<view class="message">
+												{{ item.manufactoryName }}
+											</view>
+										</view>
+										<view style="display: flex; justify-content: space-between" class="">
+											<view style="display: flex" class="content">
+												<view class="title">器具类型：</view>
+												<view class="message">
+													{{ item.typeName }}
+												</view>
+											</view>
+											<view style="display: flex; align-items: center" class="content">
+												<view class="title">规格型号：</view>
+												<view style="padding-top: 5rpx" class="message">
+													{{ item.modelSpecific }}
+												</view>
+											</view>
+										</view>
+										<view style="display: flex; justify-content: space-between" class="">
+											<view style="display: flex" class="content">
+												<view class="title">出厂编号：</view>
+												<view style="padding-top: 5rpx" class="message">
+													{{ item.serialNumber }}
+												</view>
+											</view>
+											<view style="display: flex; align-items: center" class="content">
+												<view class="title">内部编号：</view>
+												<view class="message">
+													{{ item.internalNumber }}
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</u-swipe-action-item>
+				</u-swipe-action>
+			</view>
+			<!-- <view style="height: 270rpx" class="content-header">
+				<u-checkbox-group style="margin-top: 20rpx" v-model="checkboxValue1" placement="column"
+					@change="checkboxChange">
+					<u-checkbox style="color: red" v-for="item in checkBoxList" :key="item" :label="item.name"
+						:name="item.label">
+					</u-checkbox>
+				</u-checkbox-group>
+			</view> -->
+		</view>
+		<view class="submitBtn" style="display: flex">
+			<view @click="qingkong" style="width: 20%;align-items: center;text-align: center;" class="">
+				<u-icon name="trash" color="" size="20"></u-icon><span style="font-size: 30rpx;">清空</span>
+			</view>
+			<u-button @click="addQiJu" style="width: 35%; margin: 0 auto" type="primary">新增</u-button>
+			<u-button @click="nextPage" style="width: 35%; margin: 0 auto" type="success">下一步</u-button>
+		</view>
+	</view>
 </template>
 
 <script>
-import { useDict, paraseDict } from "@/utils/index";
-import { addMiAuditOrder } from "@/api/assay.js";
+	import {
+		useDict,
+		paraseDict
+	} from "@/utils/index";
+	import {
+		addMiAuditOrder
+	} from "@/api/assay.js";
 
-import { getInfo } from "@/api/login.js";
-export default {
-  data() {
-    return {
-      options2: [
-        {
-          text: "删除",
-          style: {
-            backgroundColor: "#f56c6c",
-          },
-        },
-      ],
-      danwei: "",
-      checkboxValue1: [],
-      checkBoxList: [
-        {
-          name: "我单位承诺，本次提交备案的计量器具的相关信息均真实准确，经过自我严格审核，均符合《市场监管总局关于调整实施强制管理的计量器具目录的公告》（国家市场监督管理总局公告2020年第42号)中《实施强制管理的计量器具目录》的规定。",
-          label: false,
-        },
-      ],
-      applyPeople: "",
-      createTime: "",
-      userMobile: "",
-      dataList: [],
-      assList: [],
-      recordColor: {
-        已撤回: "#fa3534",
-        已接收: "#2979ff",
-        待提交: "#2979ff",
-        备案中: "#2979ff",
-        已拒绝: "#fa3534",
-        勿备案: "#fa3534",
-        未备案: "#909399",
-        免备案: "#909399",
-        已退回: "#fa3534",
-      },
-      record: [], //备案字典
-    };
-  },
-  onLoad() {
-    useDict("ejian_instrFillingStatus").then((res) => {
-      this.record = res;
-    });
-    getInfo().then((res) => {
-      console.log("，", res);
-      this.danwei = res.data.mechanism.name;
-      this.applyPeople = res.data.mechanism.userName;
-      this.userMobile = res.data.mechanism.userMobile;
-    });
-    let that = this;
-  },
-  onShow() {
-    uni.$once("query", (query) => {
-      if (query.a == "two") {
-        console.log("11", getApp().globalData.deptListBeiAn);
-        this.assList.push(...getApp().globalData.deptListBeiAn);
-      }
-    });
-  },
-  computed: {
-    // //检定状态
-    // verificationStatus() {
-    // 	return (row) => {
-    // 		return paraseDict(this.verification, row);
-    // 	};
-    // },
-    // //申请状态
-    // applicationStatus() {
-    // 	return (row) => {
-    // 		return paraseDict(this.application, row);
-    // 	};
-    // },
-    //备案状态
-    recordStatus() {
-      return (row) => {
-        return paraseDict(this.record, row);
-      };
-    },
-  },
-  methods: {
-    submitBeian() {
-      if (this.checkboxValue1.length == 0) {
-        this.$modal.showToast("提交前，请认真阅读理解自我承诺内容后勾选");
-      } else {
-        let ids = this.assList.map((item) => item.id).join(",");
-        console.log("ids", ids);
-        addMiAuditOrder({
-          instrumentIds: ids,
-        }).then((res) => {
-          console.log("res", res);
-          uni.showToast({
-            title: "新增成功",
-            icon: "none",
-            duration: 1000,
-          });
+	import {
+		getInfo
+	} from "@/api/login.js";
+	export default {
+		data() {
+			return {
+				options2: [{
+					text: "删除",
+					style: {
+						backgroundColor: "#f56c6c",
+					},
+				}, ],
+				danwei: "",
+				checkboxValue1: [],
+				checkBoxList: [{
+					name: "我单位承诺，本次提交备案的计量器具的相关信息均真实准确，经过自我严格审核，均符合《市场监管总局关于调整实施强制管理的计量器具目录的公告》（国家市场监督管理总局公告2020年第42号)中《实施强制管理的计量器具目录》的规定。",
+					label: false,
+				}, ],
+				applyPeople: "",
+				createTime: "",
+				userMobile: "",
+				dataList: [],
+				assList: [],
+				recordColor: {
+					已撤回: "#fa3534",
+					已接收: "#2979ff",
+					待提交: "#2979ff",
+					备案中: "#2979ff",
+					已拒绝: "#fa3534",
+					勿备案: "#fa3534",
+					未备案: "#909399",
+					免备案: "#909399",
+					已退回: "#fa3534",
+				},
+				record: [], //备案字典
+			};
+		},
+		onLoad() {
+			useDict("ejian_instrFillingStatus").then((res) => {
+				this.record = res;
+			});
+			getInfo().then((res) => {
+				console.log("，", res);
+				this.danwei = res.data.mechanism.name;
+				this.applyPeople = res.data.mechanism.userName;
+				this.userMobile = res.data.mechanism.userMobile;
+			});
+			let that = this;
+		},
+		onShow() {
+			uni.$once("query", (query) => {
+				if (query.a == "two") {
+					console.log("11", getApp().globalData.deptListBeiAn);
+					this.assList.push(...getApp().globalData.deptListBeiAn);
+				}
+			});
+		},
+		computed: {
+			// //检定状态
+			// verificationStatus() {
+			// 	return (row) => {
+			// 		return paraseDict(this.verification, row);
+			// 	};
+			// },
+			// //申请状态
+			// applicationStatus() {
+			// 	return (row) => {
+			// 		return paraseDict(this.application, row);
+			// 	};
+			// },
+			//备案状态
+			recordStatus() {
+				return (row) => {
+					return paraseDict(this.record, row);
+				};
+			},
+		},
+		methods: {
+			nextPage() {
+				let ids = this.assList.map((item) => item.id).join(",");
+				uni.navigateTo({
+					url: "/pages/assay/application?ids=" + ids,
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {},
+				});
+			},
+			submitBeian() {
+				if (this.checkboxValue1.length == 0) {
+					this.$modal.showToast("提交前，请认真阅读理解自我承诺内容后勾选");
+				} else {
+					let ids = this.assList.map((item) => item.id).join(",");
+					console.log("ids", ids);
+					addMiAuditOrder({
+						instrumentIds: ids,
+					}).then((res) => {
+						console.log("res", res);
+						uni.showToast({
+							title: "新增成功",
+							icon: "none",
+							duration: 1000,
+						});
 
-          setTimeout(() => {
-            this.assList = [];
-            this.checkboxValue1 = [];
-            uni.$emit("query", {
-              a: "one",
-            });
-            uni.navigateBack();
-          }, 500);
-        });
-      }
-    },
-    checkboxChange(value) {
-      console.log("Checkbox changed:", value);
-    },
-    shanchu(val) {
-      console.log("val", val);
-      console.log(this.$refs);
-      this.$refs.item.forEach((item) => item.closeHandler(true));
-      this.assList.splice(val, 1);
-    },
-    qingkong() {
-      this.assList = [];
-      getApp().globalData.deptListBeiAn = [];
-      this.checkboxValue1 = [];
-    },
-    onNavigationBarButtonTap(event) {
-      console.log("event", event);
-      let ids = this.assList.map((item) => item.id).join(",");
-      uni.navigateTo({
-        url: "/pages/assay/assayList?ids=" + ids,
-        success: (res) => {},
-        fail: () => {},
-        complete: () => {},
-      });
-    },
-  },
-};
+						setTimeout(() => {
+							this.assList = [];
+							this.checkboxValue1 = [];
+							uni.$emit("query", {
+								a: "one",
+							});
+							uni.navigateBack();
+						}, 500);
+					});
+				}
+			},
+			checkboxChange(value) {
+				console.log("Checkbox changed:", value);
+			},
+			shanchu(val) {
+				console.log("val", val);
+				console.log(this.$refs);
+				this.$refs.item.forEach((item) => item.closeHandler(true));
+				this.assList.splice(val, 1);
+			},
+			qingkong() {
+				this.assList = [];
+				getApp().globalData.deptListBeiAn = [];
+				this.checkboxValue1 = [];
+			},
+			addQiJu() {
+				let ids = this.assList.map((item) => item.id).join(",");
+				uni.navigateTo({
+					url: "/pages/assay/assayList?ids=" + ids,
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {},
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.container {
-  height: 100rpx;
-}
+	.container {
+		height: 100rpx;
+	}
 
-::v-deep .u-checkbox {
-  display: flex;
-  flex-direction: row;
-  /* overflow: hidden; */
-  flex-direction: row;
-  align-items: flex-start;
-}
+	::v-deep .u-icon--right[data-v-2ee87dc9] {
+		/* flex-direction: row; */
+		align-items: center;
+		flex-direction: column;
+	}
 
-::v-deep uni-text[data-v-c4a74aee] span {
-  font-size: 28rpx;
-  color: red;
-  line-height: 40rpx;
-}
+	::v-deep .u-checkbox {
+		display: flex;
+		flex-direction: row;
+		/* overflow: hidden; */
+		flex-direction: row;
+		align-items: flex-start;
+	}
 
-.submitBtn {
-  width: 100%;
-  background: #fff;
-  padding: 15rpx 0;
-  position: fixed;
-  bottom: 0;
-  z-index: 9999;
-}
+	::v-deep uni-text[data-v-c4a74aee] span {
+		font-size: 28rpx;
+		color: red;
+		line-height: 40rpx;
+	}
 
-.content-header1 {
-  width: 95%;
-  border-radius: 6px;
-  background: #fff;
-  margin: 10rpx auto 10rpx;
-  padding: 20rpx 20rpx 10rpx;
+	.submitBtn {
+		width: 100%;
+		background: #fff;
+		padding: 15rpx 0;
+		position: fixed;
+		bottom: 0;
+		z-index: 9999;
+	}
 
-  .content {
-    /* border-bottom: 1px solid rgb(242, 242, 242); */
-    padding: 8rpx 0;
-    display: flex;
-    /* justify-content: space-between; */
-  }
+	.content-header1 {
+		width: 95%;
+		border-radius: 6px;
+		background: #fff;
+		margin: 10rpx auto 10rpx;
+		padding: 20rpx 20rpx 10rpx;
 
-  .content:last-child {
-    border-bottom: none;
-  }
+		.content {
+			/* border-bottom: 1px solid rgb(242, 242, 242); */
+			padding: 8rpx 0;
+			display: flex;
+			/* justify-content: space-between; */
+		}
 
-  .passIcon {
-    position: absolute;
-    top: 20rpx;
-    right: 40rpx;
-  }
+		.content:last-child {
+			border-bottom: none;
+		}
 
-  .title {
-    font-size: 28rpx;
-    color: rgb(146, 146, 146);
-    letter-spacing: 3rpx;
-  }
+		.passIcon {
+			position: absolute;
+			top: 20rpx;
+			right: 40rpx;
+		}
 
-  .message {
-    font-size: 28rpx;
-    color: rgb(146, 146, 146);
-  }
-}
+		.title {
+			font-size: 28rpx;
+			color: rgb(146, 146, 146);
+			letter-spacing: 3rpx;
+		}
 
-.content-header {
-  width: 95%;
-  border-radius: 6px;
-  background: #fff;
-  margin: 0rpx auto 20rpx;
-  padding: 20rpx 30rpx 20rpx;
+		.message {
+			font-size: 28rpx;
+			color: rgb(146, 146, 146);
+		}
+	}
 
-  .content {
-    border-bottom: 1px solid rgb(242, 242, 242);
-    padding: 24rpx 0;
-    display: flex;
-    justify-content: space-between;
-  }
+	.content-header {
+		width: 95%;
+		border-radius: 6px;
+		background: #fff;
+		margin: 0rpx auto 20rpx;
+		padding: 20rpx 30rpx 20rpx;
 
-  .content:last-child {
-    border-bottom: none;
-  }
+		.content {
+			border-bottom: 1px solid rgb(242, 242, 242);
+			padding: 24rpx 0;
+			display: flex;
+			justify-content: space-between;
+		}
 
-  .passIcon {
-    position: absolute;
-    top: 20rpx;
-    right: 40rpx;
-  }
+		.content:last-child {
+			border-bottom: none;
+		}
 
-  .title {
-    font-size: 26rpx;
-    color: black;
-    letter-spacing: 3rpx;
-  }
+		.passIcon {
+			position: absolute;
+			top: 20rpx;
+			right: 40rpx;
+		}
 
-  .message {
-    font-size: 26rpx;
-    color: rgb(146, 146, 146);
-  }
-}
-</style>
+		.title {
+			font-size: 26rpx;
+			color: black;
+			letter-spacing: 3rpx;
+		}
+
+		.message {
+			font-size: 26rpx;
+			color: rgb(146, 146, 146);
+		}
+	}
+</style>

pages/assay/detailsList.vue

@@ -1,326 +1,306 @@
 <template>
-  <view class="container">
-    <view
-      v-for="item in ledgerList"
-      :key="item.id"
-      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 }}
-          </view>
-          <view
-            style="padding-top: 5rpx"
-            :style="{
+	<view class="container">
+		<view v-for="item in ledgerList" :key="item.id" 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 }}
+					</view>
+					<view style="padding-top: 5rpx" :style="{
               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>
-          </view>
-        </view>
-        <view style="display: flex" class="content">
-          <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>
-        </view>
-        <view style="display: flex; justify-content: space-between" class="">
-          <view style="display: flex" class="content">
-            <view class="title">器具类型：</view>
-            <view style="padding-top: 5rpx" class="message">
-              {{ item.miInstrument.typeName }}
-            </view>
-          </view>
-          <view style="display: flex; align-items: center" class="content">
-            <view class="title">规格型号：</view>
-            <view class="message">{{ item.miInstrument.modelSpecific }}</view>
-          </view>
-        </view>
-        <view style="display: flex; justify-content: space-between" class="">
-          <view style="display: flex" class="content">
-            <view class="title">出厂编号：</view>
-            <view style="padding-top: 5rpx" class="message">
-              {{ item.miInstrument.serialNumber }}
-            </view>
-          </view>
-          <view style="display: flex; align-items: center" class="content">
-            <view class="title">内部编号：</view>
-            <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
-        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>
-  </view>
+            }">{{ recordStatus(item.miInstrument.fillingStatus) }}</view>
+				</view>
+				<view style="display: flex" class="content">
+					<view class="title">唯一标识：<span class="message">{{ item.miInstrument.instrNo }}
+						</span>
+					</view>
+				</view>
+				<view style="display: flex" class="content">
+					<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>
+				</view>
+				<!-- <view style="display: flex; justify-content: space-between" class=""> -->
+				<view style="display: flex" class="content">
+					<view class="title">器具类型：</view>
+					<view class="message">
+						{{ item.miInstrument.typeName }}
+					</view>
+				</view>
+				<view style="display: flex; align-items: center" class="content">
+					<view class="title">规格型号：</view>
+					<view class="message">{{ item.miInstrument.modelSpecific }}</view>
+				</view>
+				<!-- </view> -->
+				<view style="display: flex; justify-content: space-between" class="">
+					<view style="display: flex" class="content">
+						<view class="title">出厂编号：</view>
+						<view style="padding-top: 5rpx" class="message">
+							{{ item.miInstrument.serialNumber }}
+						</view>
+					</view>
+					<view style="display: flex; align-items: center" class="content">
+						<view class="title">内部编号：</view>
+						<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 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>
+	</view>
 </template>
 
 <script>
-import {
-  getMiAuditApplyOneList,
-  getMiAuditApplyRoobtList,
-  backAudit,
-} from "@/api/assay";
-import { useDict, paraseDict } from "@/utils/index";
-export default {
-  data() {
-    return {
-      show: false,
-      recordColor: {
-        已撤回: "#fa3534",
-        已接收: "#2979ff",
-        待提交: "#2979ff",
-        备案中: "#2979ff",
-        已拒绝: "#fa3534",
-        勿备案: "#fa3534",
-        未备案: "#909399",
-        免备案: "#909399",
-        已退回: "#fa3534",
-      },
-      record: [], //备案字典
-      ledgerList: [],
-      total: 0,
-      record: [],
-      showChehui: true,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        auditOrderId: "",
-        auditOrderApplyId: "",
-      },
-    };
-  },
-  onLoad(option) {
-    useDict("ejian_instrFillingStatus").then((res) => {
-      this.record = res;
-    });
-    (this.queryParams.auditOrderId = option.auditOrderId),
-      (this.queryParams.auditOrderApplyId = option.auditOrderApplyId);
-    getMiAuditApplyRoobtList({
-      ...this.queryParams,
-    }).then((res) => {
-      this.ledgerList = res.rows;
-      this.total = res.total;
-      if (this.ledgerList[0].miInstrument.fillingStatus == "7") {
-        this.showChehui = false;
-      }
-    });
-    console.log(
-      "this.ledgerList[0].miInstrument.fillingStatus",
-      this.ledgerList
-    );
-    // for(let i=0;i<this.ledgerList)
-  },
-  computed: {
-    // //检定状态
-    // verificationStatus() {
-    // 	return (row) => {
-    // 		return paraseDict(this.verification, row);
-    // 	};
-    // },
-    // //申请状态
-    // applicationStatus() {
-    // 	return (row) => {
-    // 		return paraseDict(this.application, row);
-    // 	};
-    // },
-    //备案状态
-    recordStatus() {
-      return (row) => {
-        return paraseDict(this.record, row);
-      };
-    },
-  },
-  methods: {
-    chehui() {
-      this.show = true;
-    },
-    handleGD() {
-      backAudit({
-        applyId: this.queryParams.auditOrderApplyId,
-      }).then((res) => {
-        uni.showToast({
-          title: "撤回成功",
-          icon: "none",
-          duration: 1000,
-        });
-        getMiAuditApplyRoobtList({
-          ...this.queryParams,
-        }).then((res) => {
-          this.ledgerList = res.rows;
-          this.total = res.total;
-          if (this.ledgerList[0].miInstrument.fillingStatus == "7") {
-            this.showChehui = false;
-          }
-          this.show = false;
-        });
+	import {
+		getMiAuditApplyOneList,
+		getMiAuditApplyRoobtList,
+		backAudit,
+	} from "@/api/assay";
+	import {
+		useDict,
+		paraseDict
+	} from "@/utils/index";
+	export default {
+		data() {
+			return {
+				show: false,
+				recordColor: {
+					已撤回: "#fa3534",
+					已接收: "#2979ff",
+					待提交: "#2979ff",
+					备案中: "#2979ff",
+					已拒绝: "#fa3534",
+					勿备案: "#fa3534",
+					未备案: "#909399",
+					免备案: "#909399",
+					已退回: "#fa3534",
+				},
+				record: [], //备案字典
+				ledgerList: [],
+				total: 0,
+				record: [],
+				showChehui: true,
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					auditOrderId: "",
+					auditOrderApplyId: "",
+				},
+			};
+		},
+		onLoad(option) {
+			useDict("ejian_instrFillingStatus").then((res) => {
+				this.record = res;
+			});
+			(this.queryParams.auditOrderId = option.auditOrderId),
+			(this.queryParams.auditOrderApplyId = option.auditOrderApplyId);
+			getMiAuditApplyRoobtList({
+				...this.queryParams,
+			}).then((res) => {
+				this.ledgerList = res.rows;
+				this.total = res.total;
+				if (this.ledgerList[0].miInstrument.fillingStatus == "7") {
+					this.showChehui = false;
+				}
+			});
+			console.log(
+				"this.ledgerList[0].miInstrument.fillingStatus",
+				this.ledgerList
+			);
+			// for(let i=0;i<this.ledgerList)
+		},
+		computed: {
+			// //检定状态
+			// verificationStatus() {
+			// 	return (row) => {
+			// 		return paraseDict(this.verification, row);
+			// 	};
+			// },
+			// //申请状态
+			// applicationStatus() {
+			// 	return (row) => {
+			// 		return paraseDict(this.application, row);
+			// 	};
+			// },
+			//备案状态
+			recordStatus() {
+				return (row) => {
+					return paraseDict(this.record, row);
+				};
+			},
+		},
+		methods: {
+			chehui() {
+				this.show = true;
+			},
+			handleGD() {
+				backAudit({
+					applyId: this.queryParams.auditOrderApplyId,
+				}).then((res) => {
+					uni.showToast({
+						title: "撤回成功",
+						icon: "none",
+						duration: 1000,
+					});
+					getMiAuditApplyRoobtList({
+						...this.queryParams,
+					}).then((res) => {
+						this.ledgerList = res.rows;
+						this.total = res.total;
+						if (this.ledgerList[0].miInstrument.fillingStatus == "7") {
+							this.showChehui = false;
+						}
+						this.show = false;
+					});
 
-        // setTimeout(() => {
-        // 	uni.navigateBack()
-        // })
-      });
-    },
-    // downLoadPDF() {
-    // 		console.log('’', path)
-    // 		uni.downloadFile({
-    // 			url: path,
-    // 			success: (res) => {
-    // 				var filePath = res.tempFilePath;
-    // 				uni.openDocument({
-    // 					filePath: filePath,
-    // 					showMenu: true,
-    // 					success: function(res) {
-    // 						console.log('打开文档成功');
-    // 					}
-    // 				});
-    // 			}
-    // 		})
-    // },
-    onReachBottom() {
-      //触底事件
-      if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total) {
-        uni.showToast({
-          title: "没有更多数据了",
-          icon: "none",
-          duration: 1000,
-        });
-        setTimeout(() => {
-          uni.hideLoading();
-        }, 500);
-      } else {
-        if (this.queryParams.pageNum <= this.queryParams.pageNum - 1) {
-          setTimeout(() => {
-            uni.hideLoading();
-          }, 500);
-        } else {
-          uni.showLoading({
-            title: "加载中",
-          });
-          this.queryParams.pageNum++;
+					// setTimeout(() => {
+					// 	uni.navigateBack()
+					// })
+				});
+			},
+			// downLoadPDF() {
+			// 		console.log('’', path)
+			// 		uni.downloadFile({
+			// 			url: path,
+			// 			success: (res) => {
+			// 				var filePath = res.tempFilePath;
+			// 				uni.openDocument({
+			// 					filePath: filePath,
+			// 					showMenu: true,
+			// 					success: function(res) {
+			// 						console.log('打开文档成功');
+			// 					}
+			// 				});
+			// 			}
+			// 		})
+			// },
+			onReachBottom() {
+				//触底事件
+				if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total) {
+					uni.showToast({
+						title: "没有更多数据了",
+						icon: "none",
+						duration: 1000,
+					});
+					setTimeout(() => {
+						uni.hideLoading();
+					}, 500);
+				} else {
+					if (this.queryParams.pageNum <= this.queryParams.pageNum - 1) {
+						setTimeout(() => {
+							uni.hideLoading();
+						}, 500);
+					} else {
+						uni.showLoading({
+							title: "加载中",
+						});
+						this.queryParams.pageNum++;
 
-          getMiAuditApplyRoobtList({
-            ...this.queryParams,
-          }).then(({ rows, total }) => {
-            this.ledgerList = [...this.ledgerList, ...rows];
-            this.total = total;
-          });
-        }
-        setTimeout(() => {
-          uni.hideLoading();
-        }, 500);
-      }
-    },
-  },
-};
+						getMiAuditApplyRoobtList({
+							...this.queryParams,
+						}).then(({
+							rows,
+							total
+						}) => {
+							this.ledgerList = [...this.ledgerList, ...rows];
+							this.total = total;
+						});
+					}
+					setTimeout(() => {
+						uni.hideLoading();
+					}, 500);
+				}
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.submitBtn {
-  width: 100%;
-  background: #fff;
-  padding: 15rpx 0;
-  position: fixed;
-  bottom: 0;
-}
+	.submitBtn {
+		width: 100%;
+		background: #fff;
+		padding: 15rpx 0;
+		position: fixed;
+		bottom: 0;
+	}
 
-.content-header {
-  width: 95%;
-  border-radius: 6px;
-  background: #fff;
-  margin: 10rpx auto 10rpx;
-  padding: 20rpx 30rpx 10rpx;
+	.content-header {
+		width: 95%;
+		border-radius: 6px;
+		background: #fff;
+		margin: 10rpx auto 10rpx;
+		padding: 20rpx 30rpx 10rpx;
 
-  .content {
-    /* border-bottom: 1px solid rgb(242, 242, 242); */
-    padding: 8rpx 0;
-    display: flex;
-    /* justify-content: space-between; */
-  }
+		.content {
+			/* border-bottom: 1px solid rgb(242, 242, 242); */
+			padding: 8rpx 0;
+			display: flex;
+			/* justify-content: space-between; */
+		}
 
-  .content:last-child {
-    border-bottom: none;
-  }
+		.content:last-child {
+			border-bottom: none;
+		}
 
-  .passIcon {
-    position: absolute;
-    top: 20rpx;
-    right: 40rpx;
-  }
+		.passIcon {
+			position: absolute;
+			top: 20rpx;
+			right: 40rpx;
+		}
 
-  .title {
-    font-size: 28rpx;
-    color: rgb(146, 146, 146);
-    letter-spacing: 3rpx;
-  }
+		.title {
+			font-size: 28rpx;
+			color: rgb(146, 146, 146);
+			letter-spacing: 3rpx;
+		}
 
-  .message {
-    font-size: 28rpx;
-    color: rgb(146, 146, 146);
-  }
-}
+		.message {
+			font-size: 28rpx;
+			color: rgb(146, 146, 146);
+		}
+	}
 
-.container {
-  height: 100vh;
-  background: rgb(243, 244, 249);
-  padding: 0rpx 0 110rpx;
+	.container {
+		height: 100vh;
+		background: rgb(243, 244, 249);
+		padding: 0rpx 0 110rpx;
 
-  .contentItems {
-    width: 95%;
-    border-radius: 6px;
-    background: #fff;
-    margin: 0rpx auto 10rpx;
-    padding: 10rpx 30rpx 10rpx;
+		.contentItems {
+			width: 95%;
+			border-radius: 6px;
+			background: #fff;
+			margin: 0rpx auto 10rpx;
+			padding: 10rpx 30rpx 10rpx;
 
-    .content {
-      /* border-bottom: 1px solid rgb(242, 242, 242); */
-      padding: 14rpx 0;
-      display: flex;
-      /* justify-content: space-between; */
-    }
+			.content {
+				/* border-bottom: 1px solid rgb(242, 242, 242); */
+				padding: 14rpx 0;
+				display: flex;
+				/* justify-content: space-between; */
+			}
 
-    .content:last-child {
-      border-bottom: none;
-    }
+			.content:last-child {
+				border-bottom: none;
+			}
 
-    .title {
-      font-size: 28rpx;
-      color: black;
-      letter-spacing: 3rpx;
-    }
+			.title {
+				font-size: 28rpx;
+				color: black;
+				letter-spacing: 3rpx;
+			}
 
-    .message {
-      font-size: 28rpx;
-      color: rgb(146, 146, 146);
-    }
-  }
-}
-</style>
+			.message {
+				font-size: 28rpx;
+				color: rgb(146, 146, 146);
+			}
+		}
+	}
+</style>

pages/assay/index.vue

@@ -1,93 +1,77 @@
 <!-- @format -->
 
 <template>
-  <view class="container">
-    <view @click="handleApplicat" class="createFixed">
-      <u-icon name="plus" color="#fff" size="23"></u-icon>
-    </view>
+	<view class="container">
+		<view @click="handleApplicat" class="createFixed">
+			<u-icon name="plus" color="#fff" size="14"></u-icon><span style="margin-left: 10rpx;"> 备案新增</span>
+		</view>
 
-    <view style="margin: 15rpx 0" v-if="activeContent == '我的申请'">
-      <view style="background: #fff; padding: 10rpx 0; margin-bottom: 15rpx">
-        <u-search
-          @custom="sousuo"
-          shape="square"
-          placeholder="请输入备案单编号"
-          style="width: 95%; margin: 0rpx auto"
-        ></u-search>
-      </view>
-      <view
-        class="contentItems"
-        @click="handleDetails(item)"
-        v-for="item in ledgerList"
-        :key="item.id"
-      >
-        <view class="content">
-          <!-- <view class="title">器具名称</view> -->
-          <view
-            style="color: black; font-size: 36rpx; font-weight: 700"
-            class="message"
-            >{{ item.instrName }}
-          </view>
-        </view>
-        <view class="content">
-          <view class="title"
-            >备案单编号:
-            <text
-              class="message"
-              style="
+		<view style="margin: 15rpx 0" v-if="activeContent == '我的申请'">
+			<view style="background: #fff; padding: 10rpx 0; margin-bottom: 15rpx">
+				<u-search @custom="sousuo" shape="square" placeholder="请输入备案单编号"
+					style="width: 95%; margin: 0rpx auto"></u-search>
+			</view>
+			<view class="contentItems" @click="handleDetails(item)" v-for="item in ledgerList" :key="item.id">
+				<view class="content">
+					<!-- <view class="title">器具名称</view> -->
+					<view style="color: black; font-size: 36rpx; font-weight: 700" class="message">{{ item.instrName }}
+					</view>
+				</view>
+				<view class="content">
+					<view class="title">备案单编号:
+						<text class="message" style="
                 margin-left: 10rpx;
                 color: red;
                 font-weight: 700;
                 font-size: 30rpx;
-              "
-            >
-              {{ item.filingNo }}
-            </text>
-          </view>
-        </view>
+              ">
+							{{ item.filingNo }}
+						</text>
+					</view>
+				</view>
 
-        <!-- <view class="content">
+				<!-- <view class="content">
 					<view class="title">备案状态</view>
 					<view :style="{
 			    color: recordColor[recordStatus(item)],
 			  }">{{ recordStatus(item) }}</view>
 				</view> -->
-        <!-- 		<view class="content">
+				<!-- 		<view class="content">
 					<view class="title">行政部门</view>
 					<view style="font-weight: 700;color: black;" class="message">{{item.useOrgName}}</view>
 				</view> -->
-        <view style="display: flex; justify-content: space-between" class="">
-          <view class="content">
-            <view class="title">发起人:</view>
-            <view style="width: 100rpx" class="message">{{
+				<!-- <view style="display: flex; justify-content: space-between" class=""> -->
+				<view class="content">
+					<view class="title">发起人:</view>
+					<view style="width: 100rpx" class="message">{{
               item.userName
             }}</view>
-          </view>
-          <view class="content">
-            <view class="title">发起时间:</view>
-            <view style="padding-top: 5rpx" class="message">{{
+				</view>
+				<view class="content">
+					<view class="title">发起时间:</view>
+					<view style="padding-top: 5rpx" class="message">{{
               item.createTime
             }}</view>
-          </view>
-        </view>
-        <view style="display: flex; justify-content: space-between" class="">
-          <view style="display: flex" class="content">
-            <view class="title">联系电话:</view>
-            <view style="padding-top: 5rpx" class="message">{{
+					<!-- </view> -->
+				</view>
+				<view style="display: flex; justify-content: space-between" class="">
+					<view style="display: flex" class="content">
+						<view class="title">联系电话:</view>
+						<view style="padding-top: 5rpx" class="message">{{
               item.userMobile
             }}</view>
-          </view>
-          <view style="display: flex; align-items: center" class="content">
-            <view class="title">器具数量:</view>
-            <view style="padding-top: 5rpx" class="message">{{
+					</view>
+					<view style="display: flex; align-items: center" class="content">
+						<view class="title">器具数量:</view>
+						<view style="padding-top: 5rpx" class="message">{{
               item.instrCount
             }}</view>
-          </view>
-        </view>
-      </view>
-    </view>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!-- 	<view v-else>
+		<!-- 	<view v-else>
 			<view>
 				<view class="createNew">选择器具进行申请</view>
 				<view class="contentItems" @click="handleCurrentForm">
@@ -135,235 +119,244 @@
 				</view>
 			</view>
 		</view> -->
-  </view>
+	</view>
 </template>
 
 <script>
-import { getMiAuditApplyList } from "@/api/assay";
-import { useDict, paraseDict } from "@/utils/index";
-export default {
-  data() {
-    return {
-      recordColor: {
-        已撤回: "#fa3534",
-        已接收: "#2979ff",
-        待提交: "#2979ff",
-        备案中: "#2979ff",
-        已拒绝: "#fa3534",
-        勿备案: "#fa3534",
-        未备案: "#909399",
-        免备案: "#909399",
-        已退回: "#fa3534",
-      },
-      record: [], //备案字典
-      activeContent: "我的申请",
-      tabsList: [
-        {
-          name: "我的申请",
-        },
-      ],
-      ledgerList: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        filingNo: "",
-        orderByColumn: "createTime",
-        isAsc: "Desc",
-      },
-      total: 0,
-    };
-  },
-  async onLoad() {
-    // useDict("ejian_instrCheckStatus").then((res) => {
-    //   this.verification = res;
-    // });
-    // useDict("ejian_instrCheckRecordStatusV2").then((res) => {
-    //   this.application = res;
-    // });
-    useDict("ejian_instrFillingStatus").then((res) => {
-      this.record = res;
-    });
-    this.getList();
-    uni.startPullDownRefresh();
-  },
-  onPullDownRefresh() {
-    this.getList();
-    console.log("refresh");
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 800);
-  },
-  onShow() {
-    uni.$on("query", (query) => {
-      if (query.a == "one") {
-        console.log("query", query);
-        console.log("11111111111111111111111");
-        uni.startPullDownRefresh();
-        setTimeout(() => {
-          this.queryParams.pageNum = 1;
-          this.queryParams.pageSize = 10;
-          this.getList();
-        }, 1500);
-      }
-    });
-  },
-  computed: {
-    // //检定状态
-    // verificationStatus() {
-    // 	return (row) => {
-    // 		return paraseDict(this.verification, row);
-    // 	};
-    // },
-    // //申请状态
-    // applicationStatus() {
-    // 	return (row) => {
-    // 		return paraseDict(this.application, row);
-    // 	};
-    // },
-    //备案状态
-    recordStatus() {
-      return (row) => {
-        return paraseDict(this.record, row);
-      };
-    },
-  },
-  methods: {
-    sousuo(val) {
-      console.log(val);
-      this.queryParams.filingNo = val;
-      this.getList();
-    },
-    getList() {
-      getMiAuditApplyList({
-        ...this.queryParams,
-      }).then((res) => {
-        this.ledgerList = res.rows;
-        this.total = res.total;
-      });
-    },
-    onReachBottom() {
-      //触底事件
-      if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total) {
-        uni.showToast({
-          title: "没有更多数据了",
-          icon: "none",
-          duration: 1000,
-        });
-        setTimeout(() => {
-          uni.hideLoading();
-        }, 500);
-      } else {
-        if (this.queryParams.pageNum <= this.queryParams.pageNum - 1) {
-          setTimeout(() => {
-            uni.hideLoading();
-          }, 500);
-        } else {
-          uni.showLoading({
-            title: "加载中",
-          });
-          this.queryParams.pageNum++;
+	import {
+		getMiAuditApplyList
+	} from "@/api/assay";
+	import {
+		useDict,
+		paraseDict
+	} from "@/utils/index";
+	export default {
+		data() {
+			return {
+				recordColor: {
+					已撤回: "#fa3534",
+					已接收: "#2979ff",
+					待提交: "#2979ff",
+					备案中: "#2979ff",
+					已拒绝: "#fa3534",
+					勿备案: "#fa3534",
+					未备案: "#909399",
+					免备案: "#909399",
+					已退回: "#fa3534",
+				},
+				record: [], //备案字典
+				activeContent: "我的申请",
+				tabsList: [{
+					name: "我的申请",
+				}, ],
+				ledgerList: [],
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					filingNo: "",
+					orderByColumn: "createTime",
+					isAsc: "Desc",
+				},
+				total: 0,
+			};
+		},
+		async onLoad() {
+			// useDict("ejian_instrCheckStatus").then((res) => {
+			//   this.verification = res;
+			// });
+			// useDict("ejian_instrCheckRecordStatusV2").then((res) => {
+			//   this.application = res;
+			// });
+			useDict("ejian_instrFillingStatus").then((res) => {
+				this.record = res;
+			});
+			this.getList();
+			uni.startPullDownRefresh();
+		},
+		onPullDownRefresh() {
+			this.getList();
+			console.log("refresh");
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 800);
+		},
+		onShow() {
+			uni.$on("query", (query) => {
+				if (query.a == "one") {
+					console.log("query", query);
+					console.log("11111111111111111111111");
+					uni.startPullDownRefresh();
+					setTimeout(() => {
+						this.queryParams.pageNum = 1;
+						this.queryParams.pageSize = 10;
+						this.getList();
+					}, 1500);
+				}
+			});
+		},
+		computed: {
+			// //检定状态
+			// verificationStatus() {
+			// 	return (row) => {
+			// 		return paraseDict(this.verification, row);
+			// 	};
+			// },
+			// //申请状态
+			// applicationStatus() {
+			// 	return (row) => {
+			// 		return paraseDict(this.application, row);
+			// 	};
+			// },
+			//备案状态
+			recordStatus() {
+				return (row) => {
+					return paraseDict(this.record, row);
+				};
+			},
+		},
+		methods: {
+			sousuo(val) {
+				console.log(val);
+				this.queryParams.filingNo = val;
+				this.getList();
+			},
+			getList() {
+				getMiAuditApplyList({
+					...this.queryParams,
+				}).then((res) => {
+					this.ledgerList = res.rows;
+					this.total = res.total;
+				});
+			},
+			onReachBottom() {
+				//触底事件
+				if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total) {
+					uni.showToast({
+						title: "没有更多数据了",
+						icon: "none",
+						duration: 1000,
+					});
+					setTimeout(() => {
+						uni.hideLoading();
+					}, 500);
+				} else {
+					if (this.queryParams.pageNum <= this.queryParams.pageNum - 1) {
+						setTimeout(() => {
+							uni.hideLoading();
+						}, 500);
+					} else {
+						uni.showLoading({
+							title: "加载中",
+						});
+						this.queryParams.pageNum++;
 
-          getMiAuditApplyList({
-            ...this.queryParams,
-          }).then(({ rows, total }) => {
-            this.ledgerList = [...this.ledgerList, ...rows];
-            this.total = total;
-          });
-        }
-        setTimeout(() => {
-          uni.hideLoading();
-        }, 500);
-      }
-    },
-    //备案申请
-    handleApplicat() {
-      uni.navigateTo({
-        // url: "/pages/assay/assayList",
-        url: "/pages/assay/deptList",
-        success: (res) => {},
-        fail: () => {},
-        complete: () => {},
-      });
-    },
-    handleChange(row) {
-      this.activeContent = row.name;
-    },
-    handleCurrentForm() {},
-    handleDetails(item) {
-      uni.navigateTo({
-        url:
-          "/pages/assay/details?id=" +
-          item.id +
-          "&danwei=" +
-          item.useOrgName +
-          "&applypeople=" +
-          item.userName +
-          "&userMobile=" +
-          item.userMobile +
-          "&createTime=" +
-          item.createTime,
-        success: (res) => {},
-        fail: () => {},
-        complete: () => {},
-      });
-    },
-  },
-};
+						getMiAuditApplyList({
+							...this.queryParams,
+						}).then(({
+							rows,
+							total
+						}) => {
+							this.ledgerList = [...this.ledgerList, ...rows];
+							this.total = total;
+						});
+					}
+					setTimeout(() => {
+						uni.hideLoading();
+					}, 500);
+				}
+			},
+			//备案申请
+			handleApplicat() {
+				uni.navigateTo({
+					// url: "/pages/assay/assayList",
+					url: "/pages/assay/deptList",
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {},
+				});
+			},
+			handleChange(row) {
+				this.activeContent = row.name;
+			},
+			handleCurrentForm() {},
+			handleDetails(item) {
+				uni.navigateTo({
+					url: "/pages/assay/details?id=" +
+						item.id +
+						"&danwei=" +
+						item.useOrgName +
+						"&applypeople=" +
+						item.userName +
+						"&userMobile=" +
+						item.userMobile +
+						"&createTime=" +
+						item.createTime,
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {},
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.createFixed {
-  background: #2979ff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 90rpx;
-  height: 90rpx;
-  border-radius: 50%;
-  position: fixed;
-  right: 30rpx;
-  bottom: 200rpx;
-}
+	.createFixed {
+		background: #2979ff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 200rpx;
+		/* 宽度保持不变 */
+		height: 70rpx;
+		/* 高度保持不变 */
+		border-radius: 90rpx;
+		/* 设置为较大的值以形成胶囊形状 */
+		position: fixed;
+		right: 30rpx;
+		bottom: 200rpx;
+		color: white;
+	}
 
-.createNew {
-  font-size: 30rpx;
-  margin: 10rpx 0 10rpx 10rpx;
-  color: #3c9ff3;
-}
+	.createNew {
+		font-size: 30rpx;
+		margin: 10rpx 0 10rpx 10rpx;
+		color: #3c9ff3;
+	}
 
-.container {
-  height: 100vh;
-  background: rgb(243, 244, 249);
+	.container {
+		height: 100vh;
+		background: rgb(243, 244, 249);
 
-  .contentItems {
-    width: 93%;
-    border-radius: 6px;
-    background: #fff;
-    margin: 20rpx auto 10rpx;
-    padding: 10rpx 30rpx 10rpx;
+		.contentItems {
+			width: 93%;
+			border-radius: 6px;
+			background: #fff;
+			margin: 20rpx auto 10rpx;
+			padding: 10rpx 30rpx 10rpx;
 
-    .content {
-      // border-bottom: 1px solid rgb(242, 242, 242);
-      padding: 10rpx 0;
-      display: flex;
+			.content {
+				// border-bottom: 1px solid rgb(242, 242, 242);
+				padding: 10rpx 0;
+				display: flex;
 
-      // justify-content: space-between;
-    }
+				// justify-content: space-between;
+			}
 
-    .content:last-child {
-      border-bottom: none;
-    }
+			.content:last-child {
+				border-bottom: none;
+			}
 
-    .title {
-      font-size: 28rpx;
-      color: rgb(146, 146, 146);
-      letter-spacing: 3rpx;
-    }
+			.title {
+				font-size: 28rpx;
+				color: rgb(146, 146, 146);
+				letter-spacing: 3rpx;
+			}
 
-    .message {
-      font-size: 28rpx;
-      color: rgb(146, 146, 146);
-    }
-  }
-}
-</style>
+			.message {
+				font-size: 28rpx;
+				color: rgb(146, 146, 146);
+			}
+		}
+	}
+</style>

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "%E8%AE%A1%E9%87%8F",
+  "projectname": "%E8%AE%A1%E9%87%8F%E4%B8%AD%E5%BF%83",
   "setting": {
     "compileHotReLoad": true
   }