diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 9ac8eea..0011ab3 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="sourceApprove">
-// 溯源供方审批里诶博爱
+// 溯源供方审批列表
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
 const dictStore = useDictStore()
 interface MenuType {
   name: string
@@ -17,6 +18,7 @@
   { name: '未通过', value: '5' },
   { name: '已取消', value: '6' },
 ])
+
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -56,7 +58,7 @@
 
 }
 // 当前tab
-const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
@@ -65,10 +67,17 @@
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
 
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
-})
+}, { deep: true, immediate: true })
 </script>
 
 <template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 9ac8eea..0011ab3 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="sourceApprove">
-// 溯源供方审批里诶博爱
+// 溯源供方审批列表
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
 const dictStore = useDictStore()
 interface MenuType {
   name: string
@@ -17,6 +18,7 @@
   { name: '未通过', value: '5' },
   { name: '已取消', value: '6' },
 ])
+
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -56,7 +58,7 @@
 
 }
 // 当前tab
-const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
@@ -65,10 +67,17 @@
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
 
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
-})
+}, { deep: true, immediate: true })
 </script>
 
 <template>
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 1bbec5b..221bdca 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -14,10 +14,10 @@
   },
 })
 const companyAddress = computed(() => {
-  return [props.formData.companyCountry, props.formData.companyProvince, props.formData.companyCity, props.formData.companyArea, props.formData.companyAddress]
+  return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
 })
 const invoiceAddress = computed(() => {
-  return [props.formData.invoiceCountry, props.formData.invoiceProvince, props.formData.invoiceCity, props.formData.invoiceArea, props.formData.invoiceAddress]
+  return [props.formData.invoiceCountryName, props.formData.invoiceProvinceName, props.formData.invoiceCityName, props.formData.invoiceAreaName, props.formData.invoiceAddress]
 })
 
 const ruleFormRef = ref<FormInstance>()

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 9ac8eea..0011ab3 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="sourceApprove">
-// 溯源供方审批里诶博爱
+// 溯源供方审批列表
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
 const dictStore = useDictStore()
 interface MenuType {
   name: string
@@ -17,6 +18,7 @@
   { name: '未通过', value: '5' },
   { name: '已取消', value: '6' },
 ])
+
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -56,7 +58,7 @@
 
 }
 // 当前tab
-const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
@@ -65,10 +67,17 @@
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
 
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
-})
+}, { deep: true, immediate: true })
 </script>
 
 <template>
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 1bbec5b..221bdca 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -14,10 +14,10 @@
   },
 })
 const companyAddress = computed(() => {
-  return [props.formData.companyCountry, props.formData.companyProvince, props.formData.companyCity, props.formData.companyArea, props.formData.companyAddress]
+  return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
 })
 const invoiceAddress = computed(() => {
-  return [props.formData.invoiceCountry, props.formData.invoiceProvince, props.formData.invoiceCity, props.formData.invoiceArea, props.formData.invoiceAddress]
+  return [props.formData.invoiceCountryName, props.formData.invoiceProvinceName, props.formData.invoiceCityName, props.formData.invoiceAreaName, props.formData.invoiceAddress]
 })
 
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 3880028..e3491d5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,7 +47,7 @@
 const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
   { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
@@ -79,15 +79,15 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     loadingTable.value = false
   })
 }

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 9ac8eea..0011ab3 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="sourceApprove">
-// 溯源供方审批里诶博爱
+// 溯源供方审批列表
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
 const dictStore = useDictStore()
 interface MenuType {
   name: string
@@ -17,6 +18,7 @@
   { name: '未通过', value: '5' },
   { name: '已取消', value: '6' },
 ])
+
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -56,7 +58,7 @@
 
 }
 // 当前tab
-const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
@@ -65,10 +67,17 @@
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
 
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
-})
+}, { deep: true, immediate: true })
 </script>
 
 <template>
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 1bbec5b..221bdca 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -14,10 +14,10 @@
   },
 })
 const companyAddress = computed(() => {
-  return [props.formData.companyCountry, props.formData.companyProvince, props.formData.companyCity, props.formData.companyArea, props.formData.companyAddress]
+  return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
 })
 const invoiceAddress = computed(() => {
-  return [props.formData.invoiceCountry, props.formData.invoiceProvince, props.formData.invoiceCity, props.formData.invoiceArea, props.formData.invoiceAddress]
+  return [props.formData.invoiceCountryName, props.formData.invoiceProvinceName, props.formData.invoiceCityName, props.formData.invoiceAreaName, props.formData.invoiceAddress]
 })
 
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 3880028..e3491d5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,7 +47,7 @@
 const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
   { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
@@ -79,15 +79,15 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     loadingTable.value = false
   })
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 28157ad..c36a618 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -9,11 +9,13 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
   offset: 1,
   limit: 20,
 })
@@ -158,6 +160,7 @@
     supplierNo: '', // 业务内容
     supplierName: '', // 溯源供方名称
     businessContent: '', // 溯源供方编号
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
     offset: 1,
     limit: 20,
   }

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 9ac8eea..0011ab3 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="sourceApprove">
-// 溯源供方审批里诶博爱
+// 溯源供方审批列表
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
 const dictStore = useDictStore()
 interface MenuType {
   name: string
@@ -17,6 +18,7 @@
   { name: '未通过', value: '5' },
   { name: '已取消', value: '6' },
 ])
+
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -56,7 +58,7 @@
 
 }
 // 当前tab
-const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
@@ -65,10 +67,17 @@
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
 
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
-})
+}, { deep: true, immediate: true })
 </script>
 
 <template>
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 1bbec5b..221bdca 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -14,10 +14,10 @@
   },
 })
 const companyAddress = computed(() => {
-  return [props.formData.companyCountry, props.formData.companyProvince, props.formData.companyCity, props.formData.companyArea, props.formData.companyAddress]
+  return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
 })
 const invoiceAddress = computed(() => {
-  return [props.formData.invoiceCountry, props.formData.invoiceProvince, props.formData.invoiceCity, props.formData.invoiceArea, props.formData.invoiceAddress]
+  return [props.formData.invoiceCountryName, props.formData.invoiceProvinceName, props.formData.invoiceCityName, props.formData.invoiceAreaName, props.formData.invoiceAddress]
 })
 
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 3880028..e3491d5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,7 +47,7 @@
 const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
   { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
@@ -79,15 +79,15 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     loadingTable.value = false
   })
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 28157ad..c36a618 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -9,11 +9,13 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
   offset: 1,
   limit: 20,
 })
@@ -158,6 +160,7 @@
     supplierNo: '', // 业务内容
     supplierName: '', // 溯源供方名称
     businessContent: '', // 溯源供方编号
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
     offset: 1,
     limit: 20,
   }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a2d1d87..bda1c70 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -107,8 +107,18 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
-    companyAddress.value = [formInline.value.companyCountry, formInline.value.companyProvince, formInline.value.companyCity, formInline.value.companyArea, formInline.value.companyAddress]
-    invoiceAddress.value = [formInline.value.invoiceCountry, formInline.value.invoiceProvince, formInline.value.invoiceCity, formInline.value.invoiceArea, formInline.value.invoiceAddress]
+    // for (const key in formInline.value) {
+    //   formInline.value[key] = res.data[key]
+    // }
+    formInline.value.id = infoId.value
+    if (pageType.value !== 'detail') {
+      companyAddress.value = [formInline.value.companyCountry, formInline.value.companyProvince, formInline.value.companyCity, formInline.value.companyArea, formInline.value.companyAddress]
+      invoiceAddress.value = [formInline.value.invoiceCountry, formInline.value.invoiceProvince, formInline.value.invoiceCity, formInline.value.invoiceArea, formInline.value.invoiceAddress]
+    }
+    else {
+      companyAddress.value = [formInline.value.companyCountryName, formInline.value.companyProvinceName, formInline.value.companyCityName, formInline.value.companyAreaName, formInline.value.companyAddress]
+      invoiceAddress.value = [formInline.value.invoiceCountryName, formInline.value.invoiceProvinceName, formInline.value.invoiceCityName, formInline.value.invoiceAreaName, formInline.value.invoiceAddress]
+    }
   })
 }
 // 表格选中
@@ -200,13 +210,22 @@
           type: 'warning',
         },
       ).then(() => {
-        sourceSave(formInline.value).then((res) => {
-          if (res.code === 200) {
-            formInline.value.id = res.data.id
-            formInline.value.supplierNo = res.data.supplierNo
-            ElMessage.success('已保存')
-          }
-        })
+        if (formInline.value.supplierNo) {
+          sourceDraftUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+            }
+          })
+        }
+        else {
+          sourceSave(formInline.value).then((res) => {
+            if (res.code === 200) {
+              formInline.value.id = res.data.id
+              formInline.value.supplierNo = res.data.supplierNo
+              ElMessage.success('已保存')
+            }
+          })
+        }
       })
     }
   })

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index e447f41..8b646b1 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -47,7 +47,7 @@
     data,
   })
 }
-// 保存数据
+// 保存至草稿箱
 export function sourceSave(data: object) {
   return request({
     url: `${prefix}/supplier/save`,
@@ -55,6 +55,14 @@
     data,
   })
 }
+// 更新草稿箱文件
+export function sourceDraftUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 // 更新数据
 export function getSoucreLisUpdate(data: object) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index f5797b9..a40e715 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -27,8 +27,6 @@
     DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.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']
     ErrorDialog: typeof import('./components/dialog/errorDialog.vue')['default']
     FileUpload: typeof import('./components/FileUpload/index.vue')['default']
     FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
@@ -46,7 +44,6 @@
     PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     QrDialog: typeof import('./components/QrDialog/index.vue')['default']
-    RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
diff --git a/src/router/index.ts b/src/router/index.ts
index 3af58ea..6b9ba93 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -136,7 +136,8 @@
   to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
-    const componentName = to.matched.at(-1)?.components?.default.name
+    const componentName = to.matched[to.matched.length - 1].components?.default.name
+    // debugger
     if (componentName) {
       keepAliveStore.add(componentName)
     }
@@ -146,7 +147,7 @@
   }
   // 判断离开页面是否开启缓存，如果开启，则根据缓存规则判断是否需要清空 keep-alive 全局状态里离开页面的 name 信息
   if (from.meta.cache) {
-    const componentName = from.matched.at(-1)?.components?.default.name
+    const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
     // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts
index 88c0f5d..d470c49 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.ts
@@ -65,7 +65,7 @@
     path: '/customerManage',
     component: Layout,
     redirect: '/customerManage/list',
-    name: 'MeasureSource',
+    name: 'Customer',
     meta: {
       title: '客户管理',
       icon: 'ep:key',
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 855c6fa..4e41e86 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -390,7 +390,7 @@
     children: [
       {
         path: 'list',
-        name: 'measureSourceList',
+        name: 'MeasureSourceList',
         component: () => import('@/views/measure/source/list.vue'),
         meta: {
           title: '溯源供方列表',
@@ -418,6 +418,7 @@
           title: '溯源供方审批',
           icon: 'ep:key',
           auth: '/measure/measureSource/approve',
+          cache: true,
         },
       },
       {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 0719c75..be90c53 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -1,5 +1,8 @@
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 
+interface approvalStatus {
+  [key: string]: string
+}
 const useDictStore = defineStore(
   'dict',
   {
@@ -14,7 +17,7 @@
         已通过: '4',
         未通过: '5',
         已取消: '6',
-      }, // 审批状态
+      } as approvalStatus, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 13291b2..0f8a9d5 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -78,7 +78,7 @@
   uncertainty: '', //	不确定度
   usePerson: '', //	使用人
   mesureDept: '', //	检定部门
-  mesureCycle: 0, //	检定周期
+  mesureCycle: 24, //	检定周期
   mesureDate: '', //	检定日期
   validDate: '', //	有效日期
   mesureResult: '', //	检定结果
@@ -237,7 +237,7 @@
     uncertainty: '', //	不确定度
     usePerson: '', //	使用人
     mesureDept: '', //	检定部门
-    mesureCycle: 12, //	检定周期
+    mesureCycle: 24, //	检定周期
     mesureDate: '', //	检定日期
     validDate: '', //	有效日期
     mesureResult: '', //	检定结果
@@ -487,7 +487,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
-            <el-input-number v-model="ruleForm.mesureCycle" :min="0" :max="999" :disabled="title === 'detail'" />
+            <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
               <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select> -->
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index e070af0..ff7153c 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -40,6 +40,12 @@
 // 获取资产详情
 function getInfo() {
   assetsDetailApi({ id: id.value }).then((res) => {
+    // 将数据中number转成string
+    for (var key in res.data) {
+      if (typeof res.data[key] === 'number') {
+        res.data[key] = String(res.data[key])
+      }
+    }
     row.value = res.data
   })
 }
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index c7105dc..2d738fc 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -23,6 +23,16 @@
     type: String,
     required: true,
   },
+  // 是否测量设备
+  equipmentCategory: {
+    type: String,
+    default: '',
+  },
+  // 是否固定资产
+  isFixedAssets: {
+    type: String,
+    default: '',
+  },
   // 是否是技术指标需要校准检定的设备
   isCalibrationTestEquipment: {
     type: String,
@@ -48,18 +58,24 @@
   mesureType: '', // 检定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  assetType: '1', // 资产类型
-  isCalibrationTestEquipment: '', // 是否是技术指标需要校准检定的设备
-  isMeasureAccount: '', // 是否是技术指标需要校准检定的设备
-  isStandardSupportEquipment: '', // 是否是技术指标需要校准检定的设备
+  assetType: '', // 资产类型
+  equipmentCategory: '', // 测量设备
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
-  abc: '',
+  abc: null,
   limit: 20,
   offset: 1,
   ids: [] as string[],
 }) // 查询参数
-
+watch(() => searchQuery.abc, (newVal) => {
+  if (!newVal) {
+    searchQuery.abc = null
+  }
+})
 watch(() => validDate.value, (newVal) => {
   if (newVal) {
     searchQuery.validStartDate = newVal[0]
@@ -118,6 +134,9 @@
   searchQuery.isCalibrationTestEquipment = props.isCalibrationTestEquipment
   searchQuery.isMeasureAccount = props.isMeasureAccount
   searchQuery.isStandardSupportEquipment = props.isStandardSupportEquipment
+  if (props.name === '测量设备') {
+    searchQuery.equipmentCategory = '1'
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 27892a3..75f49ec 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -18,6 +18,7 @@
   limit: 20,
   offset: 1,
   ids: [] as string[],
+  isFixedAssets: '1',
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/standingBook/measureDevice.vue b/src/views/device/standingBook/measureDevice.vue
index dcf37ae..887c39e 100644
--- a/src/views/device/standingBook/measureDevice.vue
+++ b/src/views/device/standingBook/measureDevice.vue
@@ -5,7 +5,7 @@
 </script>
 
 <template>
-  <page name="测量设备" authority="measureDevice" />
+  <page name="测量设备" authority="measureDevice" equipment-category="1" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index be8ee06..28d3b90 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -1,7 +1,7 @@
 // 设备台账相关类型定义
 // 固定资产查询参数
 export interface fixedAssetsParams {
-  abc?: string // ABC		false
+  abc?: string | null | undefined // ABC		false
   assetNo?: string	// 资产编号		false
   assetType?: string	// 资产类型		false
   equipmentCategory?: string	// 设备类别		false
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 46f98b4..ffec04f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -57,11 +57,13 @@
   applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
-  if (newVal.applyUnit) {
-    ruleFormRef1.value.validateField('applyUnit')
-  }
-  if (newVal.applyPerson) {
-    ruleFormRef1.value.validateField('applyPerson')
+  if (name.value === '详情') {
+    if (newVal.applyUnit) {
+      ruleFormRef1.value.validateField('applyUnit')
+    }
+    if (newVal.applyPerson) {
+      ruleFormRef1.value.validateField('applyPerson')
+    }
   }
 }, {
   deep: true,
@@ -75,9 +77,11 @@
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
-  for (const key in newVal) {
-    if (newVal[key]) {
-      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+  if (name.value === '详情') {
+    for (const key in newVal) {
+      if (newVal[key]) {
+        ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+      }
     }
   }
 }, {
@@ -113,39 +117,6 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-// 检定周期
-const mesureCycleList = ref<selectType[]>([
-  {
-    name: '半年一检',
-    id: '1',
-    value: '6',
-  },
-  {
-    name: '一年一检',
-    id: '2',
-    value: '12',
-  },
-  {
-    name: '两年一检',
-    id: '3',
-    value: '24',
-  },
-  {
-    name: '三年一检',
-    id: '4',
-    value: '36',
-  },
-  {
-    name: '四年一检',
-    id: '5',
-    value: '48',
-  },
-  {
-    name: '五年一检',
-    id: '6',
-    value: '60',
-  },
-])
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -729,7 +700,7 @@
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList" style="width: 100%;" border @selection-change="handleSelectionChange">
+        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
           <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d98c06f..b3c5d1f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -2,7 +2,8 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
-// import { getApplyList } from '@/api/device/stateManage'
+import { getStatusList } from '@/api/device/stateManage'
+import { getDictByCode } from '@/api/system/dict'
 const props = defineProps({
   name: {
     type: String,
@@ -22,7 +23,6 @@
   },
 })
 const $router = useRouter()
-const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -116,31 +116,37 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // getApplyList(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      applyNo: 'sbxz20230103',
-      applyTypeName: `${props.name.substring(2, 4)}申请`,
-      equipmentNo: 'device20230103',
-      equipmentName: '测试设备',
-      modelNo: 'CL001',
-      managerStateName: '在用',
-      applyUnit: '徐州分中心',
-      applyPerson: '超级管理员',
-      time: '2023-1-3 13:47',
-      approvalStatusName: '审批中',
-    },
-  ]
-  total.value = 1
+  loadingTable.value = true
+  getDictByCode('managerState').then((response) => {
+    if (response.code === 200) {
+      console.log(response.data, 'response')
+      getStatusList(searchQuery).then((res) => {
+        if (res.code === 200) {
+          list.value = res.data.rows
+          total.value = res.data.total
+        }
+        loadingTable.value = false
+      })
+    }
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+
+  // list.value = [
+  //   {
+  //     applyNo: 'sbxz20230103',
+  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
+  //     equipmentNo: 'device20230103',
+  //     equipmentName: '测试设备',
+  //     modelNo: 'CL001',
+  //     managerStateName: '在用',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '超级管理员',
+  //     time: '2023-1-3 13:47',
+  //     approvalStatusName: '审批中',
+  //   },
+  // ]
+  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 9ac8eea..0011ab3 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="sourceApprove">
-// 溯源供方审批里诶博爱
+// 溯源供方审批列表
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
 const dictStore = useDictStore()
 interface MenuType {
   name: string
@@ -17,6 +18,7 @@
   { name: '未通过', value: '5' },
   { name: '已取消', value: '6' },
 ])
+
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -56,7 +58,7 @@
 
 }
 // 当前tab
-const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
@@ -65,10 +67,17 @@
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
 
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
-})
+}, { deep: true, immediate: true })
 </script>
 
 <template>
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 1bbec5b..221bdca 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -14,10 +14,10 @@
   },
 })
 const companyAddress = computed(() => {
-  return [props.formData.companyCountry, props.formData.companyProvince, props.formData.companyCity, props.formData.companyArea, props.formData.companyAddress]
+  return [props.formData.companyCountryName, props.formData.companyProvinceName, props.formData.companyCityName, props.formData.companyAreaName, props.formData.companyAddress]
 })
 const invoiceAddress = computed(() => {
-  return [props.formData.invoiceCountry, props.formData.invoiceProvince, props.formData.invoiceCity, props.formData.invoiceArea, props.formData.invoiceAddress]
+  return [props.formData.invoiceCountryName, props.formData.invoiceProvinceName, props.formData.invoiceCityName, props.formData.invoiceAreaName, props.formData.invoiceAddress]
 })
 
 const ruleFormRef = ref<FormInstance>()
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 3880028..e3491d5 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -47,7 +47,7 @@
 const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
   { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
   { text: '业务内容', value: 'businessContent', align: 'center' },
   { text: '业务范围', value: 'businessScope', align: 'center' },
@@ -79,15 +79,15 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    list.value = [
-      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    ]
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
     loadingTable.value = false
   })
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 28157ad..c36a618 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -9,11 +9,13 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
   offset: 1,
   limit: 20,
 })
@@ -158,6 +160,7 @@
     supplierNo: '', // 业务内容
     supplierName: '', // 溯源供方名称
     businessContent: '', // 溯源供方编号
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
     offset: 1,
     limit: 20,
   }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a2d1d87..bda1c70 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -107,8 +107,18 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
-    companyAddress.value = [formInline.value.companyCountry, formInline.value.companyProvince, formInline.value.companyCity, formInline.value.companyArea, formInline.value.companyAddress]
-    invoiceAddress.value = [formInline.value.invoiceCountry, formInline.value.invoiceProvince, formInline.value.invoiceCity, formInline.value.invoiceArea, formInline.value.invoiceAddress]
+    // for (const key in formInline.value) {
+    //   formInline.value[key] = res.data[key]
+    // }
+    formInline.value.id = infoId.value
+    if (pageType.value !== 'detail') {
+      companyAddress.value = [formInline.value.companyCountry, formInline.value.companyProvince, formInline.value.companyCity, formInline.value.companyArea, formInline.value.companyAddress]
+      invoiceAddress.value = [formInline.value.invoiceCountry, formInline.value.invoiceProvince, formInline.value.invoiceCity, formInline.value.invoiceArea, formInline.value.invoiceAddress]
+    }
+    else {
+      companyAddress.value = [formInline.value.companyCountryName, formInline.value.companyProvinceName, formInline.value.companyCityName, formInline.value.companyAreaName, formInline.value.companyAddress]
+      invoiceAddress.value = [formInline.value.invoiceCountryName, formInline.value.invoiceProvinceName, formInline.value.invoiceCityName, formInline.value.invoiceAreaName, formInline.value.invoiceAddress]
+    }
   })
 }
 // 表格选中
@@ -200,13 +210,22 @@
           type: 'warning',
         },
       ).then(() => {
-        sourceSave(formInline.value).then((res) => {
-          if (res.code === 200) {
-            formInline.value.id = res.data.id
-            formInline.value.supplierNo = res.data.supplierNo
-            ElMessage.success('已保存')
-          }
-        })
+        if (formInline.value.supplierNo) {
+          sourceDraftUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+            }
+          })
+        }
+        else {
+          sourceSave(formInline.value).then((res) => {
+            if (res.code === 200) {
+              formInline.value.id = res.data.id
+              formInline.value.supplierNo = res.data.supplierNo
+              ElMessage.success('已保存')
+            }
+          })
+        }
       })
     }
   })
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 1ac2abe..7c3efa3 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -5,6 +5,7 @@
   logType?: string
   offset: number
   limit: number
+  formId: string
 }
 
 export interface IlistType {