杜迪迪 3 місяців тому
батько
коміт
cb90b11d3a

+ 12 - 0
api/work.js

@@ -0,0 +1,12 @@
+/** @format */
+
+import request from "@/utils/request";
+
+//我的申请列表
+export const msgList = (params) => {
+	return request({
+		url: "/api/msg/list",
+		method: "get",
+		params,
+	})
+}

+ 25 - 24
config.js

@@ -2,27 +2,28 @@
 
 // 应用全局配置
 module.exports = {
-	// 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",
-			},
-		],
-	},
-};
+  // 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",
+      },
+    ],
+  },
+};

+ 20 - 2
main.js

@@ -16,10 +16,28 @@ Vue.prototype.$store = store;
 App.mpType = "app";
 
 const app = new Vue({
-  ...App,
+	...App,
 });
+window.previewPdf = (pre) => {
+	console.log(pre)
+	let path = 'http://im.hebjlzy.com/api/system/sys-file/download?bucket=local&path=' + pre
+	uni.downloadFile({
+		url: path,
+		success: (res) => {
+			var filePath = res.tempFilePath;
+			uni.openDocument({
+				filePath: filePath,
+				showMenu: true,
+				success: function(res) {
+					console.log('打开文档成功');
+				}
+			});
+		}
+	})
+
+}
 Vue.prototype.$baseUrl = config.baseUrl;
 // main.js
 Vue.use(uView);
 
-app.$mount();
+app.$mount();

+ 250 - 237
pages.json

@@ -1,240 +1,253 @@
 {
-  "pages": [
-    {
-      "path": "pages/login",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/register",
-      "style": {
-        "navigationBarTitleText": "注册"
-      }
-    },
-    {
-      "path": "pages/index",
-      "style": {
-        "navigationBarTitleText": "首页"
-      }
-    },
-    {
-      "path": "pages/work/index",
-      "style": {
-        "navigationBarTitleText": "工作台"
-      }
-    },
-    {
-      "path": "pages/mine/index",
-      "style": {
-        "navigationBarTitleText": "我的"
-      }
-    },
-    {
-      "path": "pages/mine/avatar/index",
-      "style": {
-        "navigationBarTitleText": "修改头像"
-      }
-    },
-    {
-      "path": "pages/mine/info/index",
-      "style": {
-        "navigationBarTitleText": "个人信息"
-      }
-    },
-    {
-      "path": "pages/mine/info/edit",
-      "style": {
-        "navigationBarTitleText": "编辑资料"
-      }
-    },
-    {
-      "path": "pages/mine/pwd/index",
-      "style": {
-        "navigationBarTitleText": "修改密码"
-      }
-    },
-    {
-      "path": "pages/mine/setting/index",
-      "style": {
-        "navigationBarTitleText": "应用设置"
-      }
-    },
-    {
-      "path": "pages/mine/help/index",
-      "style": {
-        "navigationBarTitleText": "常见问题"
-      }
-    },
-    {
-      "path": "pages/mine/about/index",
-      "style": {
-        "navigationBarTitleText": "关于我们"
-      }
-    },
-    {
-      "path": "pages/common/webview/index",
-      "style": {
-        "navigationBarTitleText": "浏览网页"
-      }
-    },
-    {
-      "path": "pages/common/textview/index",
-      "style": {
-        "navigationBarTitleText": "浏览文本"
-      }
-    },
-    {
-      "path": "pages/Ledger/list",
-      "style": {
-        "navigationBarTitleText": "台账"
-      }
-    },
-    {
-      "path": "pages/Ledger/details",
-      "style": {
-        "navigationBarTitleText": "详情"
-      }
-    },
-    {
-      "path": "pages/assay/index",
-      "style": {
-        "navigationBarTitleText": "我的备案申请",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
-      "path": "pages/verification/list",
-      "style": {
-        "navigationBarTitleText": "检定"
-      }
-    },
-    {
-      "path": "pages/verification/details",
-      "style": {
-        "navigationBarTitleText": "检定申请单详细"
-      }
-    },
-    {
-      "path": "pages/assay/details",
-      "style": {
-        "navigationBarTitleText": "备案查看"
-      }
-    },
-    {
-      "path": "pages/assay/application",
-      "style": {
-        "navigationBarTitleText": "器具备案申请"
-      }
-    },
-    {
-      "path": "pages/verification/taskList",
-      "style": {
-        "navigationBarTitleText": "机构任务单"
-      }
-    },
-    {
-      "path": "pages/verification/department",
-      "style": {
-        "navigationBarTitleText": "部门流转记录"
-      }
-    },
-    {
-      "path": "pages/verification/external",
-      "style": {
-        "navigationBarTitleText": "外检申请单"
-      }
-    },
-    {
-      "path": "pages/verification/externalList",
-      "style": {
-        "navigationBarTitleText": "器具列表"
-      }
-    },
+	"pages": [{
+			"path": "pages/login",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		},
+		{
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
+		{
+			"path": "pages/work/index",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		},
+		{
+			"path": "pages/mine/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "pages/mine/avatar/index",
+			"style": {
+				"navigationBarTitleText": "修改头像"
+			}
+		},
+		{
+			"path": "pages/mine/info/index",
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		},
+		{
+			"path": "pages/mine/info/edit",
+			"style": {
+				"navigationBarTitleText": "编辑资料"
+			}
+		},
+		{
+			"path": "pages/mine/pwd/index",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		},
+		{
+			"path": "pages/mine/setting/index",
+			"style": {
+				"navigationBarTitleText": "应用设置"
+			}
+		},
+		{
+			"path": "pages/mine/help/index",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
+		},
+		{
+			"path": "pages/mine/about/index",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		},
+		{
+			"path": "pages/common/webview/index",
+			"style": {
+				"navigationBarTitleText": "浏览网页"
+			}
+		},
+		{
+			"path": "pages/common/textview/index",
+			"style": {
+				"navigationBarTitleText": "浏览文本"
+			}
+		},
+		{
+			"path": "pages/Ledger/list",
+			"style": {
+				"navigationBarTitleText": "台账"
+			}
+		},
+		{
+			"path": "pages/Ledger/details",
+			"style": {
+				"navigationBarTitleText": "详情"
+			}
+		},
+		{
+			"path": "pages/assay/index",
+			"style": {
+				"navigationBarTitleText": "我的备案申请",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/verification/list",
+			"style": {
+				"navigationBarTitleText": "检定"
+			}
+		},
+		{
+			"path": "pages/verification/details",
+			"style": {
+				"navigationBarTitleText": "检定申请单详细"
+			}
+		},
+		{
+			"path": "pages/assay/details",
+			"style": {
+				"navigationBarTitleText": "备案查看"
+			}
+		},
+		{
+			"path": "pages/assay/application",
+			"style": {
+				"navigationBarTitleText": "器具备案申请"
+			}
+		},
+		{
+			"path": "pages/verification/taskList",
+			"style": {
+				"navigationBarTitleText": "机构任务单"
+			}
+		},
+		{
+			"path": "pages/verification/department",
+			"style": {
+				"navigationBarTitleText": "部门流转记录"
+			}
+		},
+		{
+			"path": "pages/verification/external",
+			"style": {
+				"navigationBarTitleText": "外检申请单"
+			}
+		},
+		{
+			"path": "pages/verification/externalList",
+			"style": {
+				"navigationBarTitleText": "器具列表"
+			}
+		},
 
-    {
-      "path": "pages/assay/assayForm",
-      "style": {
-        "navigationBarTitleText": "备案申请"
-      }
-    },
-    {
-      "path": "pages/companiesRegistered/index",
-      "style": {
-        "navigationBarTitleText": "企业注册"
-      }
-    },
-    {
-      "path": "pages/assay/assayDetails",
-      "style": {
-        "navigationBarTitleText": "器具详情"
-      }
-    },
-    {
-      "path": "pages/assay/equipmentDetails",
-      "style": {
-        "navigationBarTitleText": "计量器具信息"
-      }
-    },
-    {
-      "path": "pages/assay/detailsList",
-      "style": {
-        "navigationBarTitleText": "拟备案计量器具列表"
-      }
-    },
-    {
-      "path": "pages/assay/assayList",
-      "style": {
-        "navigationBarTitleText": "选择拟备案计量器具"
-      }
-    },
+		{
+			"path": "pages/assay/assayForm",
+			"style": {
+				"navigationBarTitleText": "备案申请"
+			}
+		},
+		{
+			"path": "pages/companiesRegistered/index",
+			"style": {
+				"navigationBarTitleText": "企业注册"
+			}
+		},
+		{
+			"path": "pages/assay/assayDetails",
+			"style": {
+				"navigationBarTitleText": "器具详情"
+			}
+		},
+		{
+			"path": "pages/assay/equipmentDetails",
+			"style": {
+				"navigationBarTitleText": "计量器具信息"
+			}
+		},
+		{
+			"path": "pages/assay/detailsList",
+			"style": {
+				"navigationBarTitleText": "拟备案计量器具列表"
+			}
+		},
+		{
+			"path": "pages/assay/assayList",
+			"style": {
+				"navigationBarTitleText": "选择拟备案计量器具"
+			}
+		},
 
-    {
-      "path": "pages/assay/deptList",
-      "style": {
-        "navigationBarTitleText": "备案新增"
-      }
-    }
-  ],
-  "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#000000",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index",
-        "iconPath": "static/images/1.png",
-        "selectedIconPath": "static/images/11.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/work/index",
-        "iconPath": "static/images/2.png",
-        "selectedIconPath": "static/images/22.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/images/3.png",
-        "selectedIconPath": "static/images/33.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "RuoYi",
-    "navigationBarBackgroundColor": "#FFFFFF"
-  },
-  "condition": {
-    "current": 0,
-    "list": [
-      {
-        "name": "",
-        "path": "pages/Ledger/list",
-        "query": ""
-      }
-    ]
-  }
-}
+		{
+			"path": "pages/assay/deptList",
+			"style": {
+				"navigationBarTitleText": "备案新增",
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": {
+						"buttons": [{
+							"fontSize": "16px",
+							"text": "新增",
+							"color": "#0070d9"
+						}]
+					}
+				}
+			}
+		},
+		{
+			"path" : "pages/work/detailInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : "详情"
+			}
+		}
+	],
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#000000",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index",
+				"iconPath": "static/images/1.png",
+				"selectedIconPath": "static/images/11.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/work/index",
+				"iconPath": "static/images/2.png",
+				"selectedIconPath": "static/images/22.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/mine/index",
+				"iconPath": "static/images/3.png",
+				"selectedIconPath": "static/images/33.png",
+				"text": "我的"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "RuoYi",
+		"navigationBarBackgroundColor": "#FFFFFF"
+	},
+	"condition": {
+		"current": 0,
+		"list": [{
+			"name": "",
+			"path": "pages/Ledger/list",
+			"query": ""
+		}]
+	}
+}

+ 120 - 122
pages/assay/assayDetails.vue

@@ -1,137 +1,135 @@
 <template>
-	<view class="container">
-		<view class="contentItems">
-			<view class="content">
-				<view style="font-size: 32rpx;" class="title">器具名称 </view>
-				<view style="font-size: 32rpx;" class="title">验光</view>
-			</view>
-
-			<view class="content">
-				<view class="title">检定状态</view>
-				<view class="message">未检定</view>
-			</view>
-			<view class="content">
-				<view class="title">备案状态</view>
-				<!-- <view :style="{
+  <view class="container">
+    <view class="contentItems">
+      <view class="content">
+        <view style="font-size: 32rpx" class="title">器具名称 </view>
+        <view style="font-size: 32rpx" class="title">验光</view>
+      </view>
+      <div></div>
+      <view class="content">
+        <view class="title">检定状态</view>
+        <view class="message">未检定</view>
+      </view>
+      <view class="content">
+        <view class="title">备案状态</view>
+        <!-- <view :style="{
 			  color: recordColor[recordStatus(item)],
 			}">{{ recordStatus(item) }}</view> -->
-			</view>
-			<view class="content">
-				<view class="title">制造单位</view>
-				<view class="message">上海光正</view>
-			</view>
-			<view class="content">
-				<view class="title">出厂编号</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">内部编号</view>
-				<view class="message">ygjpx-05</view>
-			</view>
-			<view class="content">
-				<view class="title">责任人员</view>
-				<view class="message"></view>
-			</view>
-			<view class="content">
-				<view class="title">器具项别</view>
-				<view class="message">顶焦度</view>
-			</view>
-			<view class="content">
-				<view class="title">器具种别</view>
-				<view class="message">眼科光学</view>
-			</view>
-			<view class="content">
-				<view class="title">专业类别</view>
-				<view class="message">光学</view>
-			</view>
-		</view>
-	</view>
+      </view>
+      <view class="content">
+        <view class="title">制造单位</view>
+        <view class="message">上海光正</view>
+      </view>
+      <view class="content">
+        <view class="title">出厂编号</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">内部编号</view>
+        <view class="message">ygjpx-05</view>
+      </view>
+      <view class="content">
+        <view class="title">责任人员</view>
+        <view class="message"></view>
+      </view>
+      <view class="content">
+        <view class="title">器具项别</view>
+        <view class="message">顶焦度</view>
+      </view>
+      <view class="content">
+        <view class="title">器具种别</view>
+        <view class="message">眼科光学</view>
+      </view>
+      <view class="content">
+        <view class="title">专业类别</view>
+        <view class="message">光学</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				recordColor: {
-					已撤回: "#fa3534",
-					已接收: "#2979ff",
-					待提交: "#2979ff",
-					备案中: "#2979ff",
-					已拒绝: "#fa3534",
-					勿备案: "#fa3534",
-					未备案: "#909399",
-					免备案: "#909399",
-					已退回: "#fa3534",
-				},
-				record: []
-			}
-		},
-		onLoad() {
-			useDict("ejian_instrFillingStatus").then((res) => {
-				this.record = res;
-			});
-		},
-		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: {
-
-		}
-	}
+export default {
+  data() {
+    return {
+      recordColor: {
+        已撤回: "#fa3534",
+        已接收: "#2979ff",
+        待提交: "#2979ff",
+        备案中: "#2979ff",
+        已拒绝: "#fa3534",
+        勿备案: "#fa3534",
+        未备案: "#909399",
+        免备案: "#909399",
+        已退回: "#fa3534",
+      },
+      record: [],
+    };
+  },
+  onLoad() {
+    useDict("ejian_instrFillingStatus").then((res) => {
+      this.record = res;
+    });
+  },
+  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: {},
+};
 </script>
 
 <style lang="scss">
-	.container {
-		height: 100vh;
-		background: rgb(243, 244, 249);
-		padding: 0rpx 0 110rpx;
-		margin-top: 20rpx;
+.container {
+  height: 100vh;
+  background: rgb(243, 244, 249);
+  padding: 0rpx 0 110rpx;
+  margin-top: 20rpx;
 
-		.contentItems {
-			width: 95%;
-			border-radius: 6px;
-			background: #fff;
-			margin: 0rpx auto 20rpx;
-			padding: 20rpx 30rpx 20rpx;
+  .contentItems {
+    width: 95%;
+    border-radius: 6px;
+    background: #fff;
+    margin: 0rpx auto 20rpx;
+    padding: 20rpx 30rpx 20rpx;
 
-			.content {
-				border-bottom: 1px solid rgb(242, 242, 242);
-				padding: 24rpx 0;
-				display: flex;
-				justify-content: space-between;
-			}
+    .content {
+      border-bottom: 1px solid rgb(242, 242, 242);
+      padding: 24rpx 0;
+      display: flex;
+      justify-content: space-between;
+    }
 
-			.content:last-child {
-				border-bottom: none;
-			}
+    .content:last-child {
+      border-bottom: none;
+    }
 
-			.title {
-				font-size: 26rpx;
-				color: black;
-				letter-spacing: 3rpx;
-			}
+    .title {
+      font-size: 26rpx;
+      color: black;
+      letter-spacing: 3rpx;
+    }
 
-			.message {
-				font-size: 26rpx;
-				color: rgb(146, 146, 146);
-			}
-		}
-	}
+    .message {
+      font-size: 26rpx;
+      color: rgb(146, 146, 146);
+    }
+  }
+}
 </style>

+ 132 - 120
pages/assay/assayForm.vue

@@ -1,138 +1,150 @@
 <!-- @format -->
 
 <template>
-	<view class="container">
-		<view style="margin: 15rpx 0">
-			<view class="contentItems">
-				<u-form labelPosition="left" labelWidth="160rpx">
-					<view class="content">
-						<u-form-item label="选择器具:">
-							<u-input border="none" placeholder="请输入申请单位" value="血氧仪器"></u-input>
-						</u-form-item>
-					</view>
-					<view class="content">
-						<u-form-item label="申请单位:">
-							<u-input border="none" placeholder="请输入申请单位"></u-input>
-						</u-form-item>
-					</view>
-					<view class="content">
-						<u-form-item label="申请日期:">
-							<u-input border="none" placeholder="请输入申请日期"></u-input>
-						</u-form-item>
-					</view>
-					<view class="content">
-						<u-form-item label="申请人:">
-							<u-input border="none" placeholder="请输入申请人"></u-input>
-						</u-form-item>
-					</view>
-					<view class="content">
-						<u-form-item label="联系电话:">
-							<u-input border="none" placeholder="请输入联系电话"> </u-input>
-						</u-form-item>
-					</view>
-				</u-form>
-				<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 style="width: 95%; margin: 20rpx auto 0">
-			<u-button type="primary"> 提交 </u-button>
-		</view>
-	</view>
-	</view>
+  <view class="container">
+    <view style="margin: 15rpx 0">
+      <view class="contentItems">
+        <u-form labelPosition="left" labelWidth="160rpx">
+          <view class="content">
+            <u-form-item label="选择器具:">
+              <u-input
+                border="none"
+                placeholder="请输入申请单位"
+                value="血氧仪器"
+              ></u-input>
+            </u-form-item>
+          </view>
+          <view class="content">
+            <u-form-item label="申请单位:">
+              <u-input border="none" placeholder="请输入申请单位"></u-input>
+            </u-form-item>
+          </view>
+          <view class="content">
+            <u-form-item label="申请日期:">
+              <u-input border="none" placeholder="请输入申请日期"></u-input>
+            </u-form-item>
+          </view>
+          <view class="content">
+            <u-form-item label="申请人:">
+              <u-input border="none" placeholder="请输入申请人"></u-input>
+            </u-form-item>
+          </view>
+          <view class="content">
+            <u-form-item label="联系电话:">
+              <u-input border="none" placeholder="请输入联系电话"> </u-input>
+            </u-form-item>
+          </view>
+        </u-form>
+        <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 style="width: 95%; margin: 20rpx auto 0">
+      <u-button type="primary"> 提交 </u-button>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				checked: null,
-				checkBoxList: [{
-					name: '我单位承诺,本次提交备案的计量器具的相关信息均真实准确,经过自我严格审核,均符合《市场监管总局关于调整实施强制管理的计量器具目录的公告》(国家市场监督管理总局公告2020年第42号)中《实施强制管理的计量器具目录》的规定。',
-					label: false
-				}],
-				checkboxValue1: [],
-			};
-		},
-		methods: {
-			checkboxChange(value) {
-				console.log('Checkbox changed:', value);
-			},
-		},
-	};
+export default {
+  data() {
+    return {
+      checked: null,
+      checkBoxList: [
+        {
+          name: "我单位承诺,本次提交备案的计量器具的相关信息均真实准确,经过自我严格审核,均符合《市场监管总局关于调整实施强制管理的计量器具目录的公告》(国家市场监督管理总局公告2020年第42号)中《实施强制管理的计量器具目录》的规定。",
+          label: false,
+        },
+      ],
+      checkboxValue1: [],
+    };
+  },
+  methods: {
+    checkboxChange(value) {
+      console.log("Checkbox changed:", value);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .u-checkbox {
-		display: flex;
-		flex-direction: row;
-		/* overflow: hidden; */
-		flex-direction: row;
-		align-items: flex-start;
-
-	}
+::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: 26rpx;
-		color: red;
-		line-height: 40rpx;
-	}
+::v-deep uni-text[data-v-c4a74aee] span {
+  font-size: 26rpx;
+  color: red;
+  line-height: 40rpx;
+}
 
-	.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: 90rpx;
+  height: 90rpx;
+  border-radius: 50%;
+  position: fixed;
+  right: 30rpx;
+  bottom: 200rpx;
+}
 
-	.createNew {
-		font-size: 30rpx;
-		margin: 20rpx 0 20rpx 20rpx;
-		color: #3c9ff3;
-	}
+.createNew {
+  font-size: 30rpx;
+  margin: 20rpx 0 20rpx 20rpx;
+  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: 0rpx auto 20rpx;
-			padding: 20rpx 30rpx 20rpx;
+  .contentItems {
+    width: 93%;
+    border-radius: 6px;
+    background: #fff;
+    margin: 0rpx auto 20rpx;
+    padding: 20rpx 30rpx 20rpx;
 
-			.content {
-				border-bottom: 1px solid rgb(242, 242, 242);
-				display: flex;
-				justify-content: space-between;
-			}
+    .content {
+      border-bottom: 1px solid rgb(242, 242, 242);
+      display: flex;
+      justify-content: space-between;
+    }
 
-			// .content:last-child {
-			//   border-bottom: none;
-			// }
+    // .content:last-child {
+    //   border-bottom: none;
+    // }
 
-			.title {
-				font-size: 26rpx;
-				color: black;
-				letter-spacing: 3rpx;
-			}
+    .title {
+      font-size: 26rpx;
+      color: black;
+      letter-spacing: 3rpx;
+    }
 
-			.message {
-				font-size: 26rpx;
-				color: rgb(146, 146, 146);
-			}
-		}
-	}
-</style>
+    .message {
+      font-size: 26rpx;
+      color: rgb(146, 146, 146);
+    }
+  }
+}
+</style>

+ 1 - 1
pages/assay/assayList.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view> -->
     <view style="margin: 15rpx 0">
-      <view v-for="item in ledgerList" class="contentItems">
+      <view v-for="item in ledgerList" :key="item.id" class="contentItems">
         <u-checkbox-group placement="column" @change="changeCheckBox(item)">
           <view>
             <view

+ 373 - 324
pages/assay/deptList.vue

@@ -1,351 +1,400 @@
 <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"
-					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="{
-										  color: recordColor[recordStatus(item.fillingStatus)],
-										}">{{ recordStatus(item.fillingStatus) }}</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="
+                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="{
+                          color: recordColor[recordStatus(item.fillingStatus)],
+                        }"
+                        >{{ 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">
+      <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>
 </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.insertName
-				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.insertName;
+      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,
+          });
 
-						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 = [];
+    },
+    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: () => {},
+      });
+    },
+  },
+};
 </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-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: 28rpx;
+  color: red;
+  line-height: 40rpx;
+}
 
-	::v-deep uni-text[data-v-c4a74aee] span {
-		font-size: 28rpx;
-		color: red;
-		line-height: 40rpx;
-	}
+.submitBtn {
+  width: 100%;
+  background: #fff;
+  padding: 15rpx 0;
+  position: fixed;
+  bottom: 0;
+  z-index: 9999;
+}
 
-	.submitBtn {
-		width: 100%;
-		background: #fff;
-		padding: 15rpx 0;
-		position: fixed;
-		bottom: 0;
-		z-index: 9999;
-	}
+.content-header1 {
+  width: 95%;
+  border-radius: 6px;
+  background: #fff;
+  margin: 10rpx auto 10rpx;
+  padding: 20rpx 20rpx 10rpx;
 
-	.content-header1 {
-		width: 95%;
-		border-radius: 6px;
-		background: #fff;
-		margin: 10rpx auto 10rpx;
-		padding: 20rpx 20rpx 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);
-		}
-	}
+.content-header {
+  width: 95%;
+  border-radius: 6px;
+  background: #fff;
+  margin: 0rpx auto 20rpx;
+  padding: 20rpx 30rpx 20rpx;
 
-	.content-header {
-		width: 95%;
-		border-radius: 6px;
-		background: #fff;
-		margin: 0rpx auto 20rpx;
-		padding: 20rpx 30rpx 20rpx;
+  .content {
+    border-bottom: 1px solid rgb(242, 242, 242);
+    padding: 24rpx 0;
+    display: flex;
+    justify-content: space-between;
+  }
 
-		.content {
-			border-bottom: 1px solid rgb(242, 242, 242);
-			padding: 24rpx 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: 26rpx;
+    color: black;
+    letter-spacing: 3rpx;
+  }
 
-		.title {
-			font-size: 26rpx;
-			color: black;
-			letter-spacing: 3rpx;
-		}
-
-		.message {
-			font-size: 26rpx;
-			color: rgb(146, 146, 146);
-		}
-	}
-</style>
+  .message {
+    font-size: 26rpx;
+    color: rgb(146, 146, 146);
+  }
+}
+</style>

+ 250 - 244
pages/assay/details.vue

@@ -1,9 +1,9 @@
 <!-- @format -->
 
 <template>
-	<view class="container">
-		<view style="margin-top: 15rpx">
-			<!-- 	<view class="content-header">
+  <view class="container">
+    <view style="margin-top: 15rpx">
+      <!-- 	<view class="content-header">
 				<text style="font-size: 30rpx; font-weight: 550">器具名称:血压计和血压</text>
 				<view style="font-size: 30rpx; font-weight: 550">器具类型:工作计量器具</view>
 				<view style="color: #19be6b; margin-top: 20rpx">已接受</view>
@@ -32,45 +32,54 @@
 				</view>
 			</view> -->
 
-			<view class="content-header">
-				<view class="content">
-					<view style="font-size: 28rpx;" class="title">申请单位</view>
-					<view style="font-size: 28rpx;">{{danwei}}</view>
-				</view>
-				<view class="content">
-					<view class="title">申请人</view>
-					<view>{{applyPeople}}</view>
-				</view>
-				<view class="content">
-					<view style="font-size: 28rpx;" class="title">申请日期</view>
-					<view style="font-size: 28rpx;">{{createTime}}</view>
-				</view>
-				<view class="content">
-					<view style="font-size: 28rpx;" class="title">联系电话</view>
-					<view style="font-size: 28rpx;">{{userMobile}}</view>
-				</view>
-			</view>
-			<u-divider style="padding:0 30rpx; " :dashed="true" textSize="28rpx" text="备案行政部门" textColor="#2979ff"
-				lineColor="#2979ff"></u-divider>
-			<view v-for='item in dataList' class="content-header">
-				<view @click="detailsList(item)" style="height: 140rpx;" class="">
-					<view style="display: flex;line-height: 80rpx;">
-						<!-- <view style='font-size: 32rpx;font-weight:700;' class="title">行政部门:</view> -->
-						<view style="color:black;font-size: 32rpx;font-weight:700;" class="message">
-							{{item.auditOrgName}}
-						</view>
-					</view>
-					<view style="display: flex;line-height: 40rpx;">
-						<view style="font-size: 28rpx;color:#929292" class="title">备案单编号:</view>
-						<view style="color: red;font-size: 28rpx;" class="message">
-							{{item.filingApplyNo}}
-						</view>
-					</view>
+      <view class="content-header">
+        <view class="content">
+          <view style="font-size: 28rpx" class="title">申请单位</view>
+          <view style="font-size: 28rpx">{{ danwei }}</view>
+        </view>
+        <view class="content">
+          <view class="title">申请人</view>
+          <view>{{ applyPeople }}</view>
+        </view>
+        <view class="content">
+          <view style="font-size: 28rpx" class="title">申请日期</view>
+          <view style="font-size: 28rpx">{{ createTime }}</view>
+        </view>
+        <view class="content">
+          <view style="font-size: 28rpx" class="title">联系电话</view>
+          <view style="font-size: 28rpx">{{ userMobile }}</view>
+        </view>
+      </view>
+      <u-divider
+        style="padding: 0 30rpx"
+        :dashed="true"
+        textSize="28rpx"
+        text="备案行政部门"
+        textColor="#2979ff"
+        lineColor="#2979ff"
+      ></u-divider>
+      <view v-for="item in dataList" :key="item" class="content-header">
+        <view @click="detailsList(item)" style="height: 140rpx" class="">
+          <view style="display: flex; line-height: 80rpx">
+            <!-- <view style='font-size: 32rpx;font-weight:700;' class="title">行政部门:</view> -->
+            <view
+              style="color: black; font-size: 32rpx; font-weight: 700"
+              class="message"
+            >
+              {{ item.auditOrgName }}
+            </view>
+          </view>
+          <view style="display: flex; line-height: 40rpx">
+            <view style="font-size: 28rpx; color: #929292" class="title"
+              >备案单编号:</view
+            >
+            <view style="color: red; font-size: 28rpx" class="message">
+              {{ item.filingApplyNo }}
+            </view>
+          </view>
+        </view>
 
-				</view>
-
-
-				<!-- 	<view style="	width: 95%;
+        <!-- 	<view style="	width: 95%;
 			border-radius: 6px;
 			background: #fff;
 			margin: 0rpx auto 00rpx;
@@ -126,9 +135,9 @@
 					<u-button type="primary" style="margin: 0 auto; width:47%">备案申请单PDF下载</u-button>
 					<u-button type="error" style="margin: 0rpx auto; width: 47%">撤回</u-button>
 				</view> -->
-			</view>
+      </view>
 
-			<!-- 	<view class="process">
+      <!-- 	<view class="process">
 				<view style="margin: 0rpx 0 30rpx; font-size: 28rpx"> 备案进度 </view>
 				<view>
 					<u-steps current="1" direction="column">
@@ -141,233 +150,230 @@
 					</u-steps>
 				</view>
 			</view> -->
-		</view>
+    </view>
 
-		<!-- 	<view style="display: flex;" class="submitBtn">
+    <!-- 	<view style="display: flex;" class="submitBtn">
 			<u-button type="primary" style="margin: 0 auto; width:47%">备案申请单PDF下载</u-button>
 			<u-button type="error" style="margin: 0rpx auto; width: 47%">撤回</u-button>
 		</view> -->
 
-		<view style="height: 100rpx"></view>
-	</view>
+    <view style="height: 100rpx"></view>
+  </view>
 </template>
 
 <script>
-	import {
-		getMiAuditApplyOneList,
-		getMiAuditApplyRoobtList
-	} from "@/api/assay";
-	import {
-		useDict,
-		paraseDict
-	} from "@/utils/index";
-	export default {
-		data() {
-			return {
-				recordColor: {
-					已撤回: "#fa3534",
-					已接收: "#2979ff",
-					待提交: "#2979ff",
-					备案中: "#2979ff",
-					已拒绝: "#fa3534",
-					勿备案: "#fa3534",
-					未备案: "#909399",
-					免备案: "#909399",
-					已退回: "#fa3534",
-				},
-				record: [], //备案字典
-				dataList: [],
-				applyPeople: '',
-				danwei: '',
-				userMobile: '',
-				createTime: '',
-				activeContent: "新建检定申请",
-				tabsList: [{
-						name: "新建检定申请",
-					},
-					{
-						name: "我的检定申请",
-					},
-				],
-			};
-		},
-		onLoad(options) {
-			useDict("ejian_instrFillingStatus").then((res) => {
-				this.record = res;
-			});
-			this.applyPeople = options.applypeople
-			this.danwei = options.danwei
-			this.userMobile = options.userMobile
-			this.createTime = options.createTime
-			getMiAuditApplyOneList(options.id).then((res) => {
-				console.log('res', res)
-				this.dataList = res.rows
-			})
-
-		},
-		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: {
-			detailsList(item) {
-				uni.navigateTo({
-					url: "/pages/assay/detailsList?auditOrderId=" + item.auditOrderId + '&auditOrderApplyId=' +
-						item.id,
-					success: (res) => {},
-					fail: () => {},
-					complete: () => {},
-				});
-			},
-			equipmentDetails() {
-				uni.navigateTo({
-					url: "/pages/assay/equipmentDetails",
-					success: (res) => {},
-					fail: () => {},
-					complete: () => {},
-				});
-			},
-			handleChange(row) {
-				this.activeContent = row.name;
-			},
-			handleCurrentForm() {},
-			handleVerDetails() {
-				uni.navigateTo({
-					url: "/pages/verification/details",
-					success: (res) => {},
-					fail: () => {},
-					complete: () => {},
-				});
-			},
-		},
-	};
+import { getMiAuditApplyOneList, getMiAuditApplyRoobtList } from "@/api/assay";
+import { useDict, paraseDict } from "@/utils/index";
+export default {
+  data() {
+    return {
+      recordColor: {
+        已撤回: "#fa3534",
+        已接收: "#2979ff",
+        待提交: "#2979ff",
+        备案中: "#2979ff",
+        已拒绝: "#fa3534",
+        勿备案: "#fa3534",
+        未备案: "#909399",
+        免备案: "#909399",
+        已退回: "#fa3534",
+      },
+      record: [], //备案字典
+      dataList: [],
+      applyPeople: "",
+      danwei: "",
+      userMobile: "",
+      createTime: "",
+      activeContent: "新建检定申请",
+      tabsList: [
+        {
+          name: "新建检定申请",
+        },
+        {
+          name: "我的检定申请",
+        },
+      ],
+    };
+  },
+  onLoad(options) {
+    useDict("ejian_instrFillingStatus").then((res) => {
+      this.record = res;
+    });
+    this.applyPeople = options.applypeople;
+    this.danwei = options.danwei;
+    this.userMobile = options.userMobile;
+    this.createTime = options.createTime;
+    getMiAuditApplyOneList(options.id).then((res) => {
+      console.log("res", res);
+      this.dataList = res.rows;
+    });
+  },
+  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: {
+    detailsList(item) {
+      uni.navigateTo({
+        url:
+          "/pages/assay/detailsList?auditOrderId=" +
+          item.auditOrderId +
+          "&auditOrderApplyId=" +
+          item.id,
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+    equipmentDetails() {
+      uni.navigateTo({
+        url: "/pages/assay/equipmentDetails",
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+    handleChange(row) {
+      this.activeContent = row.name;
+    },
+    handleCurrentForm() {},
+    handleVerDetails() {
+      uni.navigateTo({
+        url: "/pages/verification/details",
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.submitBtn {
-		width: 100%;
-		background: #fff;
-		padding: 15rpx 0;
-		position: fixed;
-		bottom: 0;
-	}
+.submitBtn {
+  width: 100%;
+  background: #fff;
+  padding: 15rpx 0;
+  position: fixed;
+  bottom: 0;
+}
 
-	::v-deep .u-text__value--content {
-		margin-bottom: 10rpx;
-	}
+::v-deep .u-text__value--content {
+  margin-bottom: 10rpx;
+}
 
-	::v-deep .u-steps-item__line--column {
-		height: 50rpx !important;
-		top: 70rpx;
-	}
+::v-deep .u-steps-item__line--column {
+  height: 50rpx !important;
+  top: 70rpx;
+}
 
-	::v-deep .u-steps-item__content--column {
-		margin-left: 40rpx !important;
-	}
+::v-deep .u-steps-item__content--column {
+  margin-left: 40rpx !important;
+}
 
-	::v-deep .u-steps-item__wrapper__circle {
-		width: 60rpx;
-		height: 60rpx;
-	}
+::v-deep .u-steps-item__wrapper__circle {
+  width: 60rpx;
+  height: 60rpx;
+}
 
-	::v-deep .u-steps-item--column {
-		padding-bottom: 46rpx;
-	}
+::v-deep .u-steps-item--column {
+  padding-bottom: 46rpx;
+}
 
-	.process {
-		width: 95%;
-		border-radius: 6px;
-		background: #fff;
-		margin: 0rpx auto 30rpx;
-		padding: 20rpx 30rpx 20rpx;
-		height: 650rpx;
-	}
+.process {
+  width: 95%;
+  border-radius: 6px;
+  background: #fff;
+  margin: 0rpx auto 30rpx;
+  padding: 20rpx 30rpx 20rpx;
+  height: 650rpx;
+}
 
-	.content-header {
-		width: 95%;
-		border-radius: 6px;
-		background: #fff;
-		margin: 0rpx auto 20rpx;
-		padding: 20rpx 30rpx 20rpx;
+.content-header {
+  width: 95%;
+  border-radius: 6px;
+  background: #fff;
+  margin: 0rpx auto 20rpx;
+  padding: 20rpx 30rpx 20rpx;
 
-		.content {
-			border-bottom: 1px solid rgb(242, 242, 242);
-			padding: 24rpx 0;
-			display: flex;
-			justify-content: space-between;
-		}
+  .content {
+    border-bottom: 1px solid rgb(242, 242, 242);
+    padding: 24rpx 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: 26rpx;
-			color: black;
-			letter-spacing: 3rpx;
-		}
+  .title {
+    font-size: 26rpx;
+    color: black;
+    letter-spacing: 3rpx;
+  }
 
-		.message {
-			font-size: 26rpx;
-			color: rgb(146, 146, 146);
-		}
-	}
+  .message {
+    font-size: 26rpx;
+    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 20rpx;
-			padding: 10rpx 30rpx 20rpx;
+  .contentItems {
+    width: 95%;
+    border-radius: 6px;
+    background: #fff;
+    margin: 0rpx auto 20rpx;
+    padding: 10rpx 30rpx 20rpx;
 
-			.content {
-				border-bottom: 1px solid rgb(242, 242, 242);
-				padding: 24rpx 0;
-				display: flex;
-				justify-content: space-between;
-			}
+    .content {
+      border-bottom: 1px solid rgb(242, 242, 242);
+      padding: 24rpx 0;
+      display: flex;
+      justify-content: space-between;
+    }
 
-			.content:last-child {
-				border-bottom: none;
-			}
+    .content:last-child {
+      border-bottom: none;
+    }
 
-			.title {
-				font-size: 26rpx;
-				color: black;
-				letter-spacing: 3rpx;
-			}
+    .title {
+      font-size: 26rpx;
+      color: black;
+      letter-spacing: 3rpx;
+    }
 
-			.message {
-				font-size: 26rpx;
-				color: rgb(146, 146, 146);
-			}
-		}
-	}
-</style>
+    .message {
+      font-size: 26rpx;
+      color: rgb(146, 146, 146);
+    }
+  }
+}
+</style>

+ 305 - 286
pages/assay/detailsList.vue

@@ -1,307 +1,326 @@
 <template>
-	<view class="container">
-		<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}}
-					</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>
+  <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>
 </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)
+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;
+        });
 
-		},
-		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
+        // 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++;
 
-			},
-			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() {
-			// 	downLoad(path) {
-			// 		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>

+ 199 - 203
pages/assay/equipmentDetails.vue

@@ -1,216 +1,212 @@
 <template>
-	<view class="container">
-		<view style="margin-top: 15rpx;" class="contentItems">
-			<view class="content">
-				<view class="title">唯一标识</view>
-				<view class="message">XX021406000006</view>
-			</view>
-			<view class="content">
-				<view class="title">器具类型</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">器具用途</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">器具名称</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">器具项别</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">器具种别</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">专业类别</view>
-				<view class="message">2</view>
-			</view>
-		</view>
-		<view style="margin-top: 15rpx;" class="contentItems">
-			<view class="content">
-				<view class="title">强检一级目录</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">强检二级目录</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">制造单位</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">规格型号</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">型批证号</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">出产编号</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">生产日期</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">内部编号</view>
-				<view class="message">2</view>
-			</view>
-		</view>
-		<view style="margin-top: 15rpx;" class="contentItems">
-			<view class="content">
-				<view class="title">使用状态</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">使用单位</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">单位区域</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">使用位置</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">购置日期</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">使用部门</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">保管人员</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">保管手机号</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">保管身份证号</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">使用区域</view>
-				<view class="message">2</view>
-			</view>
-
-		</view>
-		<view style="margin-top: 15rpx;" class="contentItems">
-			<view class="content">
-				<view style="width:95%;text-align: center;">强检证明</view>
-			</view>
-			<view class="content1">
-				<view class="title">贸易结算的相关证明</view>
-				<br />
-				<u-album :urls="urls2"></u-album>
-				<div class="message">暂无</div>
-			</view>
-			<view class="content1">
-				<view class="title">最近一次检定证书或新购置器具的购销合同或发票</view>
-				<br />
-				<u-album :urls="urls2"></u-album>
-				<div class="message">暂无</div>
-			</view>
-			<view class="content1">
-				<view class="title">含有出厂编号规格型号的铭牌图片</view>
-				<br />
-				<u-album :urls="urls2"></u-album>
-				<div class="message">暂无</div>
-			</view>
-		</view>
-		<view style="margin-top: 15rpx;" class="contentItems">
-			<view class="content">
-				<view style="width:95%;text-align: center;">技术参数信息</view>
-			</view>
-			<view class="content">
-				<view class="title">测量范围</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">允许误差</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">准确度等级</view>
-				<view class="message">2</view>
-			</view>
-			<view class="content">
-				<view class="title">分度值</view>
-				<view class="message">2</view>
-			</view>
-		</view>
-
-	</view>
-	</view>
+  <view class="container">
+    <view style="margin-top: 15rpx" class="contentItems">
+      <view class="content">
+        <view class="title">唯一标识</view>
+        <view class="message">XX021406000006</view>
+      </view>
+      <view class="content">
+        <view class="title">器具类型</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">器具用途</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">器具名称</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">器具项别</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">器具种别</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">专业类别</view>
+        <view class="message">2</view>
+      </view>
+    </view>
+    <view style="margin-top: 15rpx" class="contentItems">
+      <view class="content">
+        <view class="title">强检一级目录</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">强检二级目录</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">制造单位</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">规格型号</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">型批证号</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">出产编号</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">生产日期</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">内部编号</view>
+        <view class="message">2</view>
+      </view>
+    </view>
+    <view style="margin-top: 15rpx" class="contentItems">
+      <view class="content">
+        <view class="title">使用状态</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">使用单位</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">单位区域</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">使用位置</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">购置日期</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">使用部门</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">保管人员</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">保管手机号</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">保管身份证号</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">使用区域</view>
+        <view class="message">2</view>
+      </view>
+    </view>
+    <view style="margin-top: 15rpx" class="contentItems">
+      <view class="content">
+        <view style="width: 95%; text-align: center">强检证明</view>
+      </view>
+      <view class="content1">
+        <view class="title">贸易结算的相关证明</view>
+        <br />
+        <u-album :urls="urls2"></u-album>
+        <div class="message">暂无</div>
+      </view>
+      <view class="content1">
+        <view class="title">最近一次检定证书或新购置器具的购销合同或发票</view>
+        <br />
+        <u-album :urls="urls2"></u-album>
+        <div class="message">暂无</div>
+      </view>
+      <view class="content1">
+        <view class="title">含有出厂编号规格型号的铭牌图片</view>
+        <br />
+        <u-album :urls="urls2"></u-album>
+        <div class="message">暂无</div>
+      </view>
+    </view>
+    <view style="margin-top: 15rpx" class="contentItems">
+      <view class="content">
+        <view style="width: 95%; text-align: center">技术参数信息</view>
+      </view>
+      <view class="content">
+        <view class="title">测量范围</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">允许误差</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">准确度等级</view>
+        <view class="message">2</view>
+      </view>
+      <view class="content">
+        <view class="title">分度值</view>
+        <view class="message">2</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				urls2: ['https://cdn.uviewui.com/uview/album/1.jpg',
-					'https://cdn.uviewui.com/uview/album/2.jpg',
-				]
-			}
-		},
-		methods: {
-
-		}
-	}
+export default {
+  data() {
+    return {
+      urls2: [
+        "https://cdn.uviewui.com/uview/album/1.jpg",
+        "https://cdn.uviewui.com/uview/album/2.jpg",
+      ],
+    };
+  },
+  methods: {},
+};
 </script>
 
 <style lang="scss">
-	.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 20rpx;
-			padding: 10rpx 30rpx 20rpx;
+  .contentItems {
+    width: 95%;
+    border-radius: 6px;
+    background: #fff;
+    margin: 0rpx auto 20rpx;
+    padding: 10rpx 30rpx 20rpx;
 
-			.content {
-				border-bottom: 1px solid rgb(242, 242, 242);
-				padding: 24rpx 0;
-				display: flex;
-				justify-content: space-between;
-			}
+    .content {
+      border-bottom: 1px solid rgb(242, 242, 242);
+      padding: 24rpx 0;
+      display: flex;
+      justify-content: space-between;
+    }
 
-			.content1 {
-				border-bottom: 1px solid rgb(242, 242, 242);
-				padding: 24rpx 0;
-				justify-content: space-between;
-			}
+    .content1 {
+      border-bottom: 1px solid rgb(242, 242, 242);
+      padding: 24rpx 0;
+      justify-content: space-between;
+    }
 
-			.content:last-child {
-				border-bottom: none;
-			}
+    .content:last-child {
+      border-bottom: none;
+    }
 
-			.title {
-				font-size: 26rpx;
-				color: black;
-				letter-spacing: 3rpx;
-			}
+    .title {
+      font-size: 26rpx;
+      color: black;
+      letter-spacing: 3rpx;
+    }
 
-			.message {
-				font-size: 26rpx;
-				color: rgb(146, 146, 146);
-			}
-		}
-	}
-</style>
+    .message {
+      font-size: 26rpx;
+      color: rgb(146, 146, 146);
+    }
+  }
+}
+</style>

+ 293 - 268
pages/assay/index.vue

@@ -1,67 +1,93 @@
 <!-- @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="23"></u-icon>
+    </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">
-				<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>
+    <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>
 
-				<!-- <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: 120rpx;" class="message">{{item.userName}}</view>
-					</view>
-					<view class="content">
-						<view class="title">发起时间:</view>
-						<view style="padding-top:5rpx;" class="message">{{item.createTime}}</view>
-					</view>
+        <view style="display: flex; justify-content: space-between" class="">
+          <view class="content">
+            <view class="title">发起人: </view>
+            <view style="width: 120rpx" class="message">{{
+              item.userName
+            }}</view>
+          </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">{{
+              item.userMobile
+            }}</view>
+          </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 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">{{item.instrCount}}</view>
-					</view>
-				</view>
-
-			</view>
-		</view>
-
-		<!-- 	<view v-else>
+    <!-- 	<view v-else>
 			<view>
 				<view class="createNew">选择器具进行申请</view>
 				<view class="contentItems" @click="handleCurrentForm">
@@ -109,236 +135,235 @@
 				</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: 90rpx;
+  height: 90rpx;
+  border-radius: 50%;
+  position: fixed;
+  right: 30rpx;
+  bottom: 200rpx;
+}
 
-	.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>

+ 47 - 0
pages/work/detailInfo.vue

@@ -0,0 +1,47 @@
+<template>
+	<view style="padding:20rpx">
+		<view
+			style="padding: 30rpx; background-color: #fff; border-radius: 10rpx; font-size: 32rpx; line-height: 50rpx">
+			<view v-html="contents"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				contents: ''
+			}
+		},
+		onLoad(options) {
+			this.contents = options.contents;
+		},
+		computed: {
+			// formattedContents() {
+			// 	// 替换原有的 onclick 为 Vue 的 @click 事件处理
+			// 	return this.contents.replace(/onclick='window\.previewPdf\("([^"]+)"\)'/g, (match, p1) => {
+			// 		return `@click.prevent="previewPdf('${p1}')"`;
+			// 	});
+			// }
+		},
+		methods: {
+			// handleClick(event) {
+			// 	// 处理点击事件
+			// 	const target = event.target;
+			// 	if (target && target.classList.contains('pdf-link')) {
+			// 		const val = target.getAttribute('data-pdf'); // 获取链接文本
+			// 		this.previewPdf(val);
+			// 	}
+			// },
+			// previewPdf(val) {
+			// 	// 在这里添加预览 PDF 的逻辑
+			// 	console.log('预览 PDF', val);
+			// }
+		}
+	}
+</script>
+
+<style>
+	/* 添加样式(如果需要) */
+</style>

+ 119 - 15
pages/work/index.vue

@@ -1,40 +1,145 @@
 <template>
-	<view class="work-container">
-
+	<view style="height:100%;background-color:#f3f4f9;padding:20rpx" class="">
+		<view v-for="item in ledgerList"
+			style="background-color: #fff;border-radius: 20rpx;padding:20rpx;margin: 0rpx auto 20rpx;" class="">
+			<view @click="detailInfo(item)" class="">
+				<view style="display: inline-block" class="">
+					<view style="line-height: 60rpx;font-size: 36rpx;font-weight: 700;" class="">
+						{{item.title }}
+					</view>
+					<view style="line-height: 50rpx;color:#929292" class="">
+						{{item.createTime}}
+					</view>
+				</view>
+				<view style="float:right;margin-top:30rpx" class="">
+					<view v-if="item.readStatus==1" style="color:limegreen" class="">
+						已读
+					</view>
+					<view v-if="item.readStatus==0" style="color:red" class="">
+						未读
+					</view>
+				</view>
+			</view>
 
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		msgList
+	} from '@/api/work.js';
+	import {
+		useDict,
+		paraseDict
+	} from "@/utils/index";
 	export default {
 		data() {
 			return {
+				readColor: {
+					已撤回: "#fa3534",
+					已接收: "#2979ff",
+					待提交: "#2979ff",
+					备案中: "#2979ff",
+					已拒绝: "#fa3534",
+					勿备案: "#fa3534",
+					未备案: "#909399",
+					免备案: "#909399",
+					已退回: "#fa3534",
+				},
+
+				read: [], //备案字典
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+				},
+				ledgerList: [],
+				total: 0,
 				current: 0,
 				swiperDotIndex: 0,
 				data: [{
-						image: '/static/images/banner/banner01.jpg'
+						image: "/static/images/banner/banner01.jpg",
 					},
 					{
-						image: '/static/images/banner/banner02.jpg'
+						image: "/static/images/banner/banner02.jpg",
 					},
 					{
-						image: '/static/images/banner/banner03.jpg'
-					}
-				]
-			}
+						image: "/static/images/banner/banner03.jpg",
+					},
+				],
+			};
+		},
+		onLoad() {
+			// useDict("read_status").then((res) => {
+			// 	this.read = res;
+			// });
+			this.getList()
 		},
 		methods: {
+			detailInfo(item) {
+				uni.navigateTo({
+					url: '/pages/work/detailInfo?contents=' + item.contents
+				})
+			},
+			getList() {
+				msgList({
+					...this.queryParams,
+				}).then(({
+					rows,
+					total
+				}) => {
+					this.ledgerList = rows;
+					this.total = 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++;
+
+						msgList({
+							...this.queryParams,
+						}).then(({
+							rows,
+							total
+						}) => {
+							this.ledgerList = [...this.ledgerList, ...rows];
+							this.total = total;
+						});
+					}
+					setTimeout(() => {
+						uni.hideLoading();
+					}, 500);
+				}
+			},
 			clickBannerItem(item) {
-				console.info(item)
+				console.info(item);
 			},
 			changeSwiper(e) {
-				this.current = e.detail.current
+				this.current = e.detail.current;
 			},
 			changeGrid(e) {
-				this.$modal.showToast('模块建设中~')
-			}
-		}
-	}
+				this.$modal.showToast("模块建设中~");
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
@@ -75,7 +180,6 @@
 	.uni-margin-wrap {
 		width: 690rpx;
 		width: 100%;
-		;
 	}
 
 	.swiper {