diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 0f71917..192c08c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -122,9 +122,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm(Perm.ADD)" icon="icon-add" title="新增" @click="add" />
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table :data="list" :columns="columns" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 0f71917..192c08c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -122,9 +122,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm(Perm.ADD)" icon="icon-add" title="新增" @click="add" />
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table :data="list" :columns="columns" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 81b1e4d..0f8f473 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -104,12 +104,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/extend/dept/add')" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
-        <el-button :icon="Switch" @click="expandOrCollapse">
-          展开/折叠
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/extend/dept/add')" icon="icon-add" title="新增" @click="add" />
+        <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
       <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 0f71917..192c08c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -122,9 +122,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm(Perm.ADD)" icon="icon-add" title="新增" @click="add" />
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table :data="list" :columns="columns" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 81b1e4d..0f8f473 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -104,12 +104,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/extend/dept/add')" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
-        <el-button :icon="Switch" @click="expandOrCollapse">
-          展开/折叠
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/extend/dept/add')" icon="icon-add" title="新增" @click="add" />
+        <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
       <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 4fc927b..c510755 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -105,9 +105,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/dict/add')" icon="icon-add" title="新增" @click="add" />
       </template>
       <normal-table :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 0f71917..192c08c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -122,9 +122,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm(Perm.ADD)" icon="icon-add" title="新增" @click="add" />
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table :data="list" :columns="columns" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 81b1e4d..0f8f473 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -104,12 +104,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/extend/dept/add')" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
-        <el-button :icon="Switch" @click="expandOrCollapse">
-          展开/折叠
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/extend/dept/add')" icon="icon-add" title="新增" @click="add" />
+        <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
       <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 4fc927b..c510755 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -105,9 +105,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/dict/add')" icon="icon-add" title="新增" @click="add" />
       </template>
       <normal-table :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 41b8ddc..7479f29 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -140,12 +140,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/role/add')" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
-        <el-button :icon="Switch" @click="expandOrCollapse">
-          展开/折叠
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/role/add')" icon="icon-add" title="新增" @click="add" />
+        <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
       <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column

diff --git a/src/assets/icons/icon-bench.svg b/src/assets/icons/icon-bench.svg
new file mode 100644
index 0000000..61f1ca1
--- /dev/null
+++ b/src/assets/icons/icon-bench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693208632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M731 866.7H291.7c-13.8 0-25-11.2-25-25s11.2-25 25-25H731c13.8 0 25 11.2 25 25s-11.2 25-25 25z" p-id="4857"></path><path d="M513 853.1c-13.8 0-25-11.2-25-25V688.8c0-13.8 11.2-25 25-25s25 11.2 25 25v139.3c0 13.8-11.2 25-25 25z" p-id="4858"></path><path d="M815.7 139.9H220.3c-64.6 0-117.2 52.6-117.2 117.2v339.4c0 64.6 52.6 117.2 117.2 117.2h595.4c64.6 0 117.2-52.6 117.2-117.2V257.2c0-64.7-52.6-117.3-117.2-117.3zM320 556c0 13.8-11.2 25-25 25s-25-11.2-25-25V452c0-13.8 11.2-25 25-25s25 11.2 25 25v104z m146 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V371c0-13.8 11.2-25 25-25s25 11.2 25 25v185z m149 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V422c0-13.8 11.2-25 25-25s25 11.2 25 25v134z m141 0c0 13.8-11.2 25-25 25s-25-11.2-25-25V298c0-13.8 11.2-25 25-25s25 11.2 25 25v258z" p-id="4859"></path></svg>
diff --git a/src/assets/icons/icon-building.svg b/src/assets/icons/icon-building.svg
new file mode 100644
index 0000000..5f8475f
--- /dev/null
+++ b/src/assets/icons/icon-building.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693312943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M940.032 862.72H890.88V303.104c0-16.384-9.728-30.72-24.576-37.888l-245.248-128c-13.824-6.144-29.184-6.144-43.008 0-15.36 6.144-25.088 20.992-24.576 101.888V926.72h-49.152V171.008c0-82.944 0-95.232-18.432-101.888-15.872-6.656-33.28-6.656-49.152 0L156.16 217.088c-14.848 7.168-24.576 22.528-24.576 38.912v607.232h-49.152c-12.288 0-18.432 6.656-18.432 12.8V947.2c0 6.144 6.144 12.8 18.432 12.8h857.6c5.632 0 17.408-6.656 18.432-12.8v-70.656c1.536-7.68-11.776-13.824-18.432-13.824zM364.032 772.608c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-59.904c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 59.904z m0-180.736c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-60.928c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 60.928z m0-180.224c0 7.168-5.632 12.8-12.8 12.8H282.112c-7.168 0-12.8-5.632-12.8-12.8v-61.44c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8l-1.536 61.44z m403.968 360.448c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V711.68c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.736c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8v-60.416c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.416z m0-180.224c0 7.168-5.632 12.8-12.8 12.8h-70.656c-7.168 0-12.8-5.632-12.8-12.8V350.208c0-7.168 5.632-12.8 12.8-12.8h70.656c7.168 0 12.8 5.632 12.8 12.8v60.928z" p-id="9578"></path></svg>
diff --git a/src/assets/icons/icon-case.svg b/src/assets/icons/icon-case.svg
new file mode 100644
index 0000000..e44c040
--- /dev/null
+++ b/src/assets/icons/icon-case.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693741600" class="icon" viewBox="0 0 1639 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14925" xmlns:xlink="http://www.w3.org/1999/xlink" width="76.828125" height="48"><path d="M1198.125343 186.209299h-139.656974V139.656974c0-74.96738-50.330923-139.656974-118.950258-139.656974H432.732576C364.11324 0 313.782317 64.689594 313.782317 139.656974v46.552325h-139.656974c-51.38893 0-93.104649 41.71572-93.104649 93.104649v232.761624h1210.209299v-232.761624c0-51.540074-41.71572-93.104649-93.10465-93.104649z m-232.761623 0H406.886967V139.656974c0-27.961624 14.509815-46.552325 25.845609-46.552325H939.518111c11.335793 0 25.845609 18.741845 25.845609 46.552325v46.552325z m-93.10465 465.372103H499.991616v-46.552325H81.020694v325.866274c0 51.38893 41.71572 93.104649 93.104649 93.104649h1024c51.38893 0 93.104649-41.71572 93.10465-93.104649V605.029077H872.25907v46.552325z m0 0" fill="" p-id="14926"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-file.svg b/src/assets/icons/icon-file.svg
new file mode 100644
index 0000000..2d4a5fd
--- /dev/null
+++ b/src/assets/icons/icon-file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693249260" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5868" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M815.104 69.632q27.648 25.6 44.032 42.496t25.088 28.672 10.752 19.968 2.048 14.336l0 16.384-151.552 0q-10.24 0-17.92-7.68t-12.8-17.92-7.68-20.992-2.56-16.896l0-126.976 3.072 0q8.192 0 16.896 2.56t19.968 9.728 28.16 20.48 42.496 35.84zM640 129.024q0 20.48 6.144 42.496t19.456 40.96 33.792 31.232 48.128 12.288l149.504 0 0 577.536q0 29.696-11.776 53.248t-31.232 39.936-43.008 25.6-46.08 9.216l-503.808 0q-19.456 0-42.496-11.264t-43.008-29.696-33.28-41.984-13.312-49.152l0-696.32q0-21.504 9.728-44.544t26.624-42.496 38.4-32.256 45.056-12.8l391.168 0 0 128zM704.512 768q26.624 0 45.056-18.944t18.432-45.568-18.432-45.056-45.056-18.432l-384 0q-26.624 0-45.056 18.432t-18.432 45.056 18.432 45.568 45.056 18.944l384 0zM768 448.512q0-26.624-18.432-45.568t-45.056-18.944l-384 0q-26.624 0-45.056 18.944t-18.432 45.568 18.432 45.056 45.056 18.432l384 0q26.624 0 45.056-18.432t18.432-45.056z" p-id="5869"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/icon-price.svg b/src/assets/icons/icon-price.svg
new file mode 100644
index 0000000..f5cddf6
--- /dev/null
+++ b/src/assets/icons/icon-price.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1671693532491" class="icon" viewBox="0 0 1088 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12221" xmlns:xlink="http://www.w3.org/1999/xlink" width="51" height="48"><path d="M992 64H768c-52.8 0-126.546 30.546-163.882 67.882L227.882 508.118c-37.334 37.334-37.334 98.428 0 135.764l280.236 280.232c37.334 37.336 98.428 37.336 135.764 0l376.232-376.232C1057.454 510.546 1088 436.8 1088 384V160c0-52.8-43.2-96-96-96zM864 384c-53.02 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96zM86.626 598.624l342.378 342.378c-36.264 19.16-82.462 13.54-112.886-16.888L35.882 643.882c-37.334-37.336-37.334-98.43 0-135.764l376.236-376.236C449.454 94.546 523.2 64 576 64L86.626 553.372c-12.444 12.446-12.444 32.808 0 45.252z" p-id="12222"></path></svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index 0d418d2..b48f4dd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -22,6 +22,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
diff --git a/src/components/DetailPage/index.vue b/src/components/DetailPage/index.vue
new file mode 100644
index 0000000..e627083
--- /dev/null
+++ b/src/components/DetailPage/index.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup name="DetailPage">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  .header {
+    position: relative;
+    background-color: #fff;
+    height: 50px;
+    border-radius: 8px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 20px 20px 20px 10px;
+    margin-top: 10px;
+    border-radius: 8px;
+  }
+}
+</style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index ba55463..475f4ad 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -7,6 +7,7 @@
   Star,
 } from '@element-plus/icons-vue'
 // props参数
+type Size = 'small' | 'large' | 'default' | ''
 const props = defineProps({
   type: {
     type: String,
@@ -27,10 +28,13 @@
   size: {
     type: String,
     default: '',
+    validator: (value: string) => {
+      return ['', 'small', 'large', 'default', 'mini'].includes(value)
+    },
   }, // 按钮及输入框大小
   icon: {
     type: Boolean,
-    default: true,
+    default: false,
   }, // 是否显示图标
 })
 // 抛出事件
@@ -76,26 +80,26 @@
         </div>
       </el-collapse-transition>
       <div v-if="type === 'default'">
-        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+        <el-button v-if="type === 'default'" :size="size as Size" type="primary" class="search-btn" :icon="icon ? Search : ''" @click="search">
           搜索
         </el-button>
-        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+        <el-button v-if="type === 'default' && needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
           高级检索
         </el-button>
-        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+        <el-button v-if="type === 'default' && needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
           重置
         </el-button>
         <slot name="btns" />
       </div>
     </div>
     <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
-        搜索
+      <el-button :size="size as Size" type="primary" :icon="icon ? Search : ''" class="search-btn" @click="search">
+        查询
       </el-button>
-      <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+      <el-button v-if="needSearchMore" :size="size as Size" type="primary" class="search-btn" :icon="icon ? More : ''" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size as Size" type="warning" class="search-btn" :icon="icon ? Delete : ''" @click="clearInput">
         重置
       </el-button>
       <slot name="btns" />
@@ -107,8 +111,6 @@
 .search-div {
   padding: 12px;
   padding-bottom: 2px; /* 本身输入框有10px下边距 */
-  // padding-left: 0;
-  // padding-top: 2px;
   background-color: #fff; /* Safari */
   display: flex;
   justify-content: space-between;
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..0763c5a 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -70,10 +77,11 @@
   getuser()
   getuser()
   getPubList()
-  if (row.title === '新增') {
+  if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -228,58 +237,61 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ fileTypeName }}-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            提交
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${title}${fileTypeName}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="系统编号" prop="fileNo">
+            <el-form-item label="制度文件编号" prop="fileNo">
               <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="类别">
               <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +307,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -342,44 +354,11 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 10px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
               />
             </el-form-item>
-            <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -425,82 +442,52 @@
             <el-form-item label="人员编号" prop="staffNo">
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" prop="sex" class="marg-item">
               <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="文化程度" prop="education">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
-                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+            <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="行政职务" prop="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="工作部门" prop="deptId">
-              <!-- <el-select v-model="ruleForm.deptId" placeholder="工作部门" :disabled="title === '详情'">
-                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select> -->
-              <el-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="从事日期" prop="workDate">
+            <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择从事日期"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="是否主考人" prop="mainExaminer">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否特操人" prop="specialOperator">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
-                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="是否技术考核" prop="technologyExam">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 0f71917..192c08c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -122,9 +122,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm(Perm.ADD)" icon="icon-add" title="新增" @click="add" />
       </template>
       <!-- 查询结果Table显示 -->
       <normal-table :data="list" :columns="columns" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 81b1e4d..0f8f473 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -104,12 +104,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/extend/dept/add')" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
-        <el-button :icon="Switch" @click="expandOrCollapse">
-          展开/折叠
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/extend/dept/add')" icon="icon-add" title="新增" @click="add" />
+        <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
       <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 4fc927b..c510755 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -105,9 +105,7 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
-          新增
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/dict/add')" icon="icon-add" title="新增" @click="add" />
       </template>
       <normal-table :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 41b8ddc..7479f29 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -140,12 +140,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/role/add')" type="primary" :icon="Plus" @click="add">
-          新增
-        </el-button>
-        <el-button :icon="Switch" @click="expandOrCollapse">
-          展开/折叠
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/role/add')" icon="icon-add" title="新增" @click="add" />
+        <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
       <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index e27a855..d8ea8b5 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -11,7 +11,7 @@
 // 树形结构
 export interface TreeStructure {
   checked: boolean
-  children: TreeStructure[]
+  children?: TreeStructure[]
   code: string
   id: string
   name: string