wxd

pages.json

@@ -1,249 +1,240 @@
 {
-	"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": "备案新增",
-				"enablePullDownRefresh": false,
-				"app-plus": {
-					// "bounce": "none",
-					"titleNView": {
-						"buttons": [{
-							"fontSize": "16px",
-							"text": "新增",
-							"color": "#3c9cff"
-							// "onclick": "navigateToAddPage"
-						}]
-					}
-				}
-			}
-		}
-
-	],
-	"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": "备案新增"
+      }
+    }
+  ],
+  "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": ""
+      }
+    ]
+  }
 }

pages/Ledger/details.vue

@@ -99,7 +99,10 @@
         <view class="message">{{  }}</view>
       </view> -->
     </view>
-
+    <view class="history">
+      <u-button type="primary" size="small">检定记录</u-button>
+      <u-button type="primary" size="small">备案记录</u-button>
+    </view>
     <view style="height: 20rpx"></view>
   </view>
 </template>
@@ -182,6 +185,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.history {
+  background: #fff;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
 .container {
   height: 100vh;
   background: rgb(243, 244, 249);

pages/assay/assayDetails.vue

@@ -1,137 +1,137 @@
 <!-- @format -->
 
 <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="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="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>
-.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);
-    }
-  }
-}
-</style>
+			.message {
+				font-size: 26rpx;
+				color: rgb(146, 146, 146);
+			}
+		}
+	}
+</style>