diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 
diff --git a/src/views/system/area/area-interface.ts b/src/views/system/area/area-interface.ts
index 627a360..904997e 100644
--- a/src/views/system/area/area-interface.ts
+++ b/src/views/system/area/area-interface.ts
@@ -7,7 +7,7 @@
 }
 
 export interface IareaForm {
-  id: string // 编号
+  id?: string // 编号
   pid: string // 父级编号
   pName: string // 父级名称
   areaName: string // 区域名

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 
diff --git a/src/views/system/area/area-interface.ts b/src/views/system/area/area-interface.ts
index 627a360..904997e 100644
--- a/src/views/system/area/area-interface.ts
+++ b/src/views/system/area/area-interface.ts
@@ -7,7 +7,7 @@
 }
 
 export interface IareaForm {
-  id: string // 编号
+  id?: string // 编号
   pid: string // 父级编号
   pName: string // 父级名称
   areaName: string // 区域名
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 8256924..70384ba 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -6,7 +6,7 @@
 import AreaSelectTree from './areaSelectTree.vue'
 import type { IareaForm } from './area-interface'
 import { addArea, getAreaType, updateArea } from '@/api/system/area'
-const emits = defineEmits(['watchChild'])
+const emits = defineEmits(['watchChild', 'refresh'])
 const dataFormRef = ref()
 const areaSelect = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -18,7 +18,7 @@
   areaName: '', // 区域名
   simpleName: '', // 别名，
   level: '',
-  num: 99, // 排序
+  num: 1, // 排序
 }) // 表单
 const areaSelectShow = ref(false)
 const areaLevelList = ref([]) as any // 区域树列表数据
@@ -28,7 +28,7 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
   areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
   simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
   pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
@@ -49,7 +49,7 @@
     areaName: '', // 区域名
     simpleName: '', // 别名，
     level: '',
-    num: 99, // 排序
+    num: 4, // 排序
   }
 }
 // 获取区域类型
@@ -118,6 +118,10 @@
             nextTick(() => {
               dataFormRef.value.clearValidate()
             })
+            // 通知父组件刷新状态
+            setTimeout(() => {
+              emits('refresh')
+            })
           }).catch(() => { // 选否,关闭窗口，并刷新页面
             emits('watchChild')
             dialogFormVisible.value = false
@@ -143,6 +147,9 @@
           })
           dataFormRef.value.clearValidate()
           emits('watchChild')
+          setTimeout(() => {
+            emits('refresh')
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 
diff --git a/src/views/system/area/area-interface.ts b/src/views/system/area/area-interface.ts
index 627a360..904997e 100644
--- a/src/views/system/area/area-interface.ts
+++ b/src/views/system/area/area-interface.ts
@@ -7,7 +7,7 @@
 }
 
 export interface IareaForm {
-  id: string // 编号
+  id?: string // 编号
   pid: string // 父级编号
   pName: string // 父级名称
   areaName: string // 区域名
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 8256924..70384ba 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -6,7 +6,7 @@
 import AreaSelectTree from './areaSelectTree.vue'
 import type { IareaForm } from './area-interface'
 import { addArea, getAreaType, updateArea } from '@/api/system/area'
-const emits = defineEmits(['watchChild'])
+const emits = defineEmits(['watchChild', 'refresh'])
 const dataFormRef = ref()
 const areaSelect = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -18,7 +18,7 @@
   areaName: '', // 区域名
   simpleName: '', // 别名，
   level: '',
-  num: 99, // 排序
+  num: 1, // 排序
 }) // 表单
 const areaSelectShow = ref(false)
 const areaLevelList = ref([]) as any // 区域树列表数据
@@ -28,7 +28,7 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
   areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
   simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
   pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
@@ -49,7 +49,7 @@
     areaName: '', // 区域名
     simpleName: '', // 别名，
     level: '',
-    num: 99, // 排序
+    num: 4, // 排序
   }
 }
 // 获取区域类型
@@ -118,6 +118,10 @@
             nextTick(() => {
               dataFormRef.value.clearValidate()
             })
+            // 通知父组件刷新状态
+            setTimeout(() => {
+              emits('refresh')
+            })
           }).catch(() => { // 选否,关闭窗口，并刷新页面
             emits('watchChild')
             dialogFormVisible.value = false
@@ -143,6 +147,9 @@
           })
           dataFormRef.value.clearValidate()
           emits('watchChild')
+          setTimeout(() => {
+            emits('refresh')
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 38fd8ae..deb0bfe 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -44,6 +44,7 @@
 // 获取区域数据
 const fetchData = () => {
   listLoading.value = true
+  list.value = []
   getAreaByPid('0').then((res) => {
     list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     list.value = toTreeList(list.value)
@@ -118,7 +119,7 @@
 ) => {
   getAreaByPid(row.id).then((res) => {
     console.log(res.data, 'res.data')
-    const data = res.data.map((item: any) => ({ ...item, hasChildren: item.level < 4 }))
+    const data = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     resolve(data)
   })
 }
@@ -150,7 +151,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" />
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" @refresh="fetchData" />
   </app-container>
 </template>
 

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 
diff --git a/src/views/system/area/area-interface.ts b/src/views/system/area/area-interface.ts
index 627a360..904997e 100644
--- a/src/views/system/area/area-interface.ts
+++ b/src/views/system/area/area-interface.ts
@@ -7,7 +7,7 @@
 }
 
 export interface IareaForm {
-  id: string // 编号
+  id?: string // 编号
   pid: string // 父级编号
   pName: string // 父级名称
   areaName: string // 区域名
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 8256924..70384ba 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -6,7 +6,7 @@
 import AreaSelectTree from './areaSelectTree.vue'
 import type { IareaForm } from './area-interface'
 import { addArea, getAreaType, updateArea } from '@/api/system/area'
-const emits = defineEmits(['watchChild'])
+const emits = defineEmits(['watchChild', 'refresh'])
 const dataFormRef = ref()
 const areaSelect = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -18,7 +18,7 @@
   areaName: '', // 区域名
   simpleName: '', // 别名，
   level: '',
-  num: 99, // 排序
+  num: 1, // 排序
 }) // 表单
 const areaSelectShow = ref(false)
 const areaLevelList = ref([]) as any // 区域树列表数据
@@ -28,7 +28,7 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
   areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
   simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
   pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
@@ -49,7 +49,7 @@
     areaName: '', // 区域名
     simpleName: '', // 别名，
     level: '',
-    num: 99, // 排序
+    num: 4, // 排序
   }
 }
 // 获取区域类型
@@ -118,6 +118,10 @@
             nextTick(() => {
               dataFormRef.value.clearValidate()
             })
+            // 通知父组件刷新状态
+            setTimeout(() => {
+              emits('refresh')
+            })
           }).catch(() => { // 选否,关闭窗口，并刷新页面
             emits('watchChild')
             dialogFormVisible.value = false
@@ -143,6 +147,9 @@
           })
           dataFormRef.value.clearValidate()
           emits('watchChild')
+          setTimeout(() => {
+            emits('refresh')
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 38fd8ae..deb0bfe 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -44,6 +44,7 @@
 // 获取区域数据
 const fetchData = () => {
   listLoading.value = true
+  list.value = []
   getAreaByPid('0').then((res) => {
     list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     list.value = toTreeList(list.value)
@@ -118,7 +119,7 @@
 ) => {
   getAreaByPid(row.id).then((res) => {
     console.log(res.data, 'res.data')
-    const data = res.data.map((item: any) => ({ ...item, hasChildren: item.level < 4 }))
+    const data = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     resolve(data)
   })
 }
@@ -150,7 +151,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" />
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" @refresh="fetchData" />
   </app-container>
 </template>
 
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 64ffbc4..95dd3c2 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -11,16 +11,16 @@
 const { proxy } = getCurrentInstance() as any
 
 // 默认查询条件
-const defaultQuery = {
-  keyword: '',
-}
+// const defaultQuery = {
+//   deptName: '',
+// }
 // 查询条件
-const listQuery = reactive({ ...defaultQuery })
+const listQuery = reactive({ deptName: '' })
 // 搜索重置
-function reset() {
-  Object.assign(listQuery, defaultQuery)
-  fetchData()
-}
+// function reset() {
+//   Object.assign(listQuery, defaultQuery)
+//   fetchData()
+// }
 // 表格表头
 const columns = ref([
   { text: '组织名称', value: 'simpleName', align: 'left' },
@@ -39,6 +39,7 @@
 // 查询数据
 function fetchData() {
   loading.value = true
+  console.log(listQuery, 'listQuery')
   getDeptList(listQuery).then((res) => {
     const treeData = toTreeList<DeptInfo>(res.data.list, '0', false)
     list.value = treeData
@@ -99,7 +100,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="组织名称" />
+        <el-input v-model="listQuery.deptName" placeholder="组织名称" clearable />
       </search-item>
     </search-area>
     <table-container>

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 
diff --git a/src/views/system/area/area-interface.ts b/src/views/system/area/area-interface.ts
index 627a360..904997e 100644
--- a/src/views/system/area/area-interface.ts
+++ b/src/views/system/area/area-interface.ts
@@ -7,7 +7,7 @@
 }
 
 export interface IareaForm {
-  id: string // 编号
+  id?: string // 编号
   pid: string // 父级编号
   pName: string // 父级名称
   areaName: string // 区域名
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 8256924..70384ba 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -6,7 +6,7 @@
 import AreaSelectTree from './areaSelectTree.vue'
 import type { IareaForm } from './area-interface'
 import { addArea, getAreaType, updateArea } from '@/api/system/area'
-const emits = defineEmits(['watchChild'])
+const emits = defineEmits(['watchChild', 'refresh'])
 const dataFormRef = ref()
 const areaSelect = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -18,7 +18,7 @@
   areaName: '', // 区域名
   simpleName: '', // 别名，
   level: '',
-  num: 99, // 排序
+  num: 1, // 排序
 }) // 表单
 const areaSelectShow = ref(false)
 const areaLevelList = ref([]) as any // 区域树列表数据
@@ -28,7 +28,7 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
   areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
   simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
   pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
@@ -49,7 +49,7 @@
     areaName: '', // 区域名
     simpleName: '', // 别名，
     level: '',
-    num: 99, // 排序
+    num: 4, // 排序
   }
 }
 // 获取区域类型
@@ -118,6 +118,10 @@
             nextTick(() => {
               dataFormRef.value.clearValidate()
             })
+            // 通知父组件刷新状态
+            setTimeout(() => {
+              emits('refresh')
+            })
           }).catch(() => { // 选否,关闭窗口，并刷新页面
             emits('watchChild')
             dialogFormVisible.value = false
@@ -143,6 +147,9 @@
           })
           dataFormRef.value.clearValidate()
           emits('watchChild')
+          setTimeout(() => {
+            emits('refresh')
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 38fd8ae..deb0bfe 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -44,6 +44,7 @@
 // 获取区域数据
 const fetchData = () => {
   listLoading.value = true
+  list.value = []
   getAreaByPid('0').then((res) => {
     list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     list.value = toTreeList(list.value)
@@ -118,7 +119,7 @@
 ) => {
   getAreaByPid(row.id).then((res) => {
     console.log(res.data, 'res.data')
-    const data = res.data.map((item: any) => ({ ...item, hasChildren: item.level < 4 }))
+    const data = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     resolve(data)
   })
 }
@@ -150,7 +151,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" />
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" @refresh="fetchData" />
   </app-container>
 </template>
 
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 64ffbc4..95dd3c2 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -11,16 +11,16 @@
 const { proxy } = getCurrentInstance() as any
 
 // 默认查询条件
-const defaultQuery = {
-  keyword: '',
-}
+// const defaultQuery = {
+//   deptName: '',
+// }
 // 查询条件
-const listQuery = reactive({ ...defaultQuery })
+const listQuery = reactive({ deptName: '' })
 // 搜索重置
-function reset() {
-  Object.assign(listQuery, defaultQuery)
-  fetchData()
-}
+// function reset() {
+//   Object.assign(listQuery, defaultQuery)
+//   fetchData()
+// }
 // 表格表头
 const columns = ref([
   { text: '组织名称', value: 'simpleName', align: 'left' },
@@ -39,6 +39,7 @@
 // 查询数据
 function fetchData() {
   loading.value = true
+  console.log(listQuery, 'listQuery')
   getDeptList(listQuery).then((res) => {
     const treeData = toTreeList<DeptInfo>(res.data.list, '0', false)
     list.value = treeData
@@ -99,7 +100,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="组织名称" />
+        <el-input v-model="listQuery.deptName" placeholder="组织名称" clearable />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index d5d597a..14b11aa 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -138,11 +138,17 @@
 const fileUrl = ref('')
 const downRef = ref()
 const exportSele = (row: templateType) => {
-  getPhotoUrl(row.minioFileName).then((res) => {
-    fileUrl.value = res.data
-    downRef.value.click()
-  })
-//  下载模板
+  if (row.minioFileName) {
+    getPhotoUrl(row.minioFileName).then((res) => {
+      fileUrl.value = res.data
+      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+    }).catch(() => {
+      ElMessage.error('下载失败')
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
 }
 // 表格被选中的行
 const selectList = ref<templateType[]>([])

diff --git a/.env.development b/.env.development
index aaa71a7..742f90b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
+# VITE_APP_API_BASEURL = http://192.168.83.30:5909
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
index f8143b7..95eb183 100644
--- a/src/api/business/lab/primitiveLogList.ts
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -2,7 +2,7 @@
  * 原始记录接口
 */
 import request from '../../index'
-import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import type { IListQuery, IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 const prefix = '/business/originalRecord'
 
 // 列表查询
@@ -60,3 +60,12 @@
   })
 }
 
+// 根据委托单id查询关联样品信息(分页)
+export function getSamplesByOderId(data: IListQuerySample) {
+  return request({
+    url: `${prefix}/samplesByOderId?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index a027580..0e05759 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -42,14 +42,14 @@
   })
 }
 
-// // 新建
-// export function addPrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/add`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 新建
+export function addReport(data: any) {
+  return request({
+    url: `${prefix}/save`,
+    method: 'post',
+    data,
+  })
+}
 
 // // 编辑
 // export function updatePrimitiveLog(data: any) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index cfcbfaf..45b4fe4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -4,6 +4,7 @@
 import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login'
 import { changePwd } from '@/api/system/user'
 import type { Menu } from '@/global'
+import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -20,6 +21,7 @@
       attr1: '', // 备用属性
       tenantId: '', // 租户id
       publicKey: localStorage.publicKey || '', // 公钥
+      privateKey: getPrivateKey() || '', // 私钥
       roleList: [] as string[], // 角色id集合
       roleNames: [] as string[], // 角色名称集合
       roleTips: [] as string[], // 角色标签集合
@@ -47,6 +49,9 @@
       getPublicKey: (state) => {
         return state.publicKey
       },
+      getPrivateKey: (state) => {
+        return state.privateKey
+      },
       getMenus: (state): Menu.menu[] => {
         return state.menus
       },
@@ -61,6 +66,9 @@
           getConfig().then((res) => {
             this.publicKey = res.data.publicKey
             localStorage.setItem('publicKey', res.data.publicKey)
+            // 保存私钥
+            setPrivateKey(privateStr)
+            this.privateKey = privateStr
             resolve(res.data)
           }).catch((e) => {
             reject(e)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 0000000..fb2046a
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,14 @@
+const PrivateKey = 'private_key' // 私钥
+export const privateStr = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK7mTyBxMUnLlS0x+a0qJHd/8RxR73eTN+15GPr6wzl8dG86Jvzb66pAyOBpFmIxyvceIcgVjm8Dpz5F9vlHYI6K2g6HHID1TZ4teSfPEtRAgCpcC8pA7wqd6sDVCNx2zvGEkHZc+FYWVjhFW0xPbCvaUx3b1AMTgX+TPIOE0GnHAgMBAAECgYEAhJApfzRsIDu++L99N4POmgiOLmHn+CDMbiCwD2LLX6H1+mwAKv1hVOy/lF/ySEDnToA3KJk2GOyS8X9EH1K7WmxRcJ1am1JLwy+spHkExQzvAO9mrEhtavpwAZLiBoCUB4uQazETHncM0lNXtUYY8Ydd/zKodCMVPN4tql84f0kCQQDrPEgk6vdAc8vW1JL3ldhRkbl7DKuvDhhoixGEbXrsXXiKN6iB0A3lNTptMxcd1TjSJz8CF8piGRpVyLGoZOYLAkEAvlaXoVXndT+hbsStjORp2RGxZWMPyyyJ4Kw2TnMaUuODXA0PtnYcSA5lI6SpVAvTthSX7VDi5C9xLyc+QRvMtQJAVjzhTfd98XkCL536yx16El1UHFJG1oRaWmkxYNUqDWEvAazp770weukKpGHohZ1XmWOd68yA+3msd+p9hviGhQJAUIntgUwLM3aoRWmdkhd4nmw5JxCCt1LySIo2NH3J7rbsd3/jXS6fCvJkY2+iYrjabZpLKxTl3O4iM3SkiAJOXQJBAN++IAMMs7HVTQnsIN+L+tQwcWM5jn0sSRLGFvSkPjlT2W++qJNTW/oswmcQTPFn7Vf3GaE5JF6XAxrZMOZBG00='
+// 获取私钥
+export function getPrivateKey() {
+  return window.localStorage.getItem(PrivateKey)
+}
+// 设置私钥
+export function setPrivateKey(privateKey: string) {
+  return window.localStorage.setItem(PrivateKey, privateKey)
+}
+// 移除私钥
+export function removePrivateKey() {
+  return window.localStorage.removeItem(PrivateKey)
+}
diff --git a/src/utils/security.ts b/src/utils/security.ts
index 9252b14..160b4b0 100644
--- a/src/utils/security.ts
+++ b/src/utils/security.ts
@@ -28,4 +28,25 @@
   }
   return enRes
 }
-
+/**
+ * 解密
+ * @param value 待解密数据
+ * @returns 解密结果
+ */
+export async function RSAdecrypt(value: string): Promise<string> {
+  var encrypt = new JsEncrypt()
+  let enRes = ''
+  if (userStore.getPrivateKey && userStore.getPrivateKey === '') {
+    const res = await userStore.getBaseConfig()
+    if (res && res.privateKey) {
+      const privateKey = res.privateKey
+      encrypt.setPrivateKey(privateKey)
+      enRes = encrypt.decrypt(value) || ''
+    }
+  }
+  else {
+    encrypt.setPrivateKey(userStore.getPrivateKey)
+    enRes = encrypt.decrypt(value) || ''
+  }
+  return enRes
+}
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 6ff117e..e21a8dc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -3,10 +3,10 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IListQuerySample } from '@/views/business/lab/primitiveLog/primitiveLogList'
 import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+import { getSamplesByOderId } from '@/api/business/lab/primitiveLogList'
 
 const props = defineProps({
   visible: {
@@ -17,14 +17,23 @@
     type: String,
     default: '',
   },
+  orderId: {
+    type: String,
+    default: '',
+  },
 })
 const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
 
 // 查询条件
-const listQuery: Ref<ISampleListQuery> = ref({
+const listQuery: Ref<IListQuerySample> = ref({
+  id: '', // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: '',	// 出厂编号
+  measureCategory: '',	// 校验类别
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
-  sampleName: '', // 样品名称
-  sampleNo: '', // 样品编号
   offset: 1,
   limit: 20,
 })
@@ -58,13 +67,9 @@
     listQuery.value.offset = 1
   }
   listQuery.value.customerId = props.customerId
-  getSampleList(listQuery.value).then((response) => {
-    list.value = response.data.rows.map((item: any) => {
-      return {
-        ...item,
-        id: item.sampleId,
-      }
-    })
+  listQuery.value.id = props.orderId
+  getSamplesByOderId(listQuery.value).then((response) => {
+    list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -86,9 +91,14 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
+    id: '', // 原始记录单id----(在这里后端要求传委托书id)
+    manufacturingNo: '',	// 出厂编号
+    measureCategory: '',	// 校验类别
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
-    sampleName: '', // 样品名称
-    sampleNo: '', // 样品编号
     offset: 1,
     limit: 20,
   }
@@ -162,7 +172,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <!-- 序号 -->
         <template #preColumns>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index d8b58bf..7b43fdc 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -46,3 +46,17 @@
   width?: string // 列宽
 }
 
+// 所用设备表头
+export interface IListQuerySample {
+  id: string // 原始记录单id----(在这里后端要求传委托书id)
+  manufacturingNo: string	// 出厂编号
+  measureCategory: string	// 校验类别
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  customerId: string // 委托方id
+  offset: number
+  limit: number
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 60385b9..39efdb5 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -694,7 +694,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -714,7 +714,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -727,7 +727,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -738,7 +738,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -749,7 +749,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -760,7 +760,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -785,7 +785,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -799,7 +799,7 @@
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -812,7 +812,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -989,7 +989,7 @@
   <!-- 选择委托书组件 -->
   <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
   <!-- 选择样品组件 -->
-  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <select-sample v-model:visible="sampleVisible" :order-id="formInline.orderId" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 75f0e06..c663f79 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,12 +1,14 @@
+<!-- 证书报告新增、详情、编辑 -->
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
+import type { IFileList, columnsType } from '../report_interface'
+import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
+import SelectFiles from '../../components/selectFiles.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -19,6 +21,10 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
+import { addReport } from '@/api/business/lab/report'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import type { fileListType } from '@/views/measure/file/file-interface'
+
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,6 +34,12 @@
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
+const checkoutFilesList = ref([]) // 技术文件多选
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const filesVisible = ref(false) // 控制选择技术文件对话框显隐
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -51,51 +63,63 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  certificateReportCategory: '', // 证书类别,多个逗号分割
-  certificateReportName: '', // 证书报告名称
-  orderId: '', // 委托书id
-  certificateReportCode: '', // 	证书报告编号
-  sampleId: '', // 样品id
-  measureDeptId: '', // 检定部门id
-  calibrationMajor: '', // 检校专业
-  issuanceDate: '', // 出具日期
-  expirationDate: '', // expirationDate
-  templateId: '', // 证书报告模板id
-  signId: '', // 电子签章id
   approvalSignId: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  approvalStatus: '', // 审批状态
+  calibrationMajor: '', // 检校专业
+  calibrationMajorName: '', // 检校专业名称
+  certificateReportCategory: '', // 证书类别
+  certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
+  certificateReportName: '', // 证书报告名称
+  expirationDate: '', // 证书有效期
+  issuanceDate: '', // 出具日期
+  measureDeptId: '', // 检定部门id
+  measurePersonId: '', // 检定人员
+  measureResult: '', // 检定结果
+  orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  remark: '', // 备注
-  createUser: '', // 创建人id
+  printNum: '', // 	打印次数
+  printStatus: '', // 	可打印状态
+  processId: '', // 	流程实例id
+  sampleId: '', // 	样品id
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  remark: '', // 证书报告备注
+  templateId: '', // 证书报告模板id
+  templateName: '', // 证书报告模板名称
+  businessOriginalRecord: {
+    calibrationPlace: '', // 检校地点
+    originalRecordNo: '', // 原始记录编号
+    businessEnvironmentRecord: { // 环境记录单
+      temperature: '', // 环境记录单温度
+      humidity: '', // 环境记录单相对湿度
+      environmentCode: '', // 环境记录单编号
+    }, // 环境记录单信息
+    customerSampleInfo: { // 样品信息
+      sampleNo: '', // 样品编号
+      sampleName: '', // 样品名称
+      manufacturingNo: '', // 出厂编号
+      sampleModel: '', // 型号
+      manufacturer: '', // 生产厂家
+      deliverer: '', // 送检人
+      delivererTel: '', // 送检人联系方式
+      measureContent: '', // 检定项目
+    },
+    businessOrder: { // 委托书
+      orderCode: '', // 委托书编号
+      customerNo: '', // 委托方代码
+      customerName: '', // 委托方名称
+      customerPhone: '', // 委托方电话
+      customerAddress: '', // 委托方地址
+      planDeliverTime: '', // 预计送达时间
+      requireOverTime: '', // 要求检完时间
+    },
+  } as any, // 原始记录
+  equipmentInfoList: [] as any, // 测量设备
+  fileList: [] as any, // 技术文件
 })
 
-const fromListInfo = ref<IFromListInfoType>({
-  templateName: '', // 证书报告模板名称
-  signName: '', // 电子签章名称
-  approvalSignName: '', // 认可标准专用章
-  originalRecordName: '', // 原始记录名称
-  calibrationPlace: '', // 校验地点
-  temperature: '', // 温度
-  humidity: '', // 相对湿度
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  leaveNo: '', // 出厂编号
-  customerId: '', // 委托方代码
-  customerName: '', // 委托方名称
-  customerPhone: '', // 委托方电话
-  customerLocation: '', // 委托方地址
-  censorshipUser: '', // 送检人
-  phone: '', // 送检人联系方式
-  taskId: '',
-  expectedDeliveryTime: '', // 预计送达时间
-  expectedCompletionTime: '', // 预计检完时间
-  verificationItems: '', // 检定项目
-  model: '', // 型号
-  manufacturer: '', // 生产厂家
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  fileList: [],
-})
 // 下拉框数组类型
 interface IOptions {
   id: string
@@ -144,8 +168,6 @@
     standardOwnerOptions.value = res.data.records
   })
 }
-// 数据
-const list = ref<object[]>([])
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -162,22 +184,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -186,6 +200,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: true,
     choose: false,
     time: false,
@@ -200,7 +215,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -209,32 +224,28 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
     time: false,
   },
 ])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 申请文档表头
+
+// 所依据的技术文件表头
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件编号',
-    value: 'fileName',
+    value: 'fileNo',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
   },
   {
     text: '文件名称',
-    value: 'createTime',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
@@ -242,137 +253,46 @@
   },
   {
     text: '文件代号',
-    value: 'remark',
+    value: 'fileCode',
     align: 'center',
     required: true,
     time: false,
     choose: false,
   },
 ])
-// 标准配套设备更换表格分页
-const changePage = () => {}
+
 getStandardOwnerOptions()
-// 添加表格数据对象
-const addList = ref({})
-// 添加表格弹窗开关
-const dialogVisible = ref(false)
-// 选择标准装置数据列表下拉框类型
-interface standardListType {
-  id: string
-  standardName: string
-}
-// 选择标准装置数据列表下拉框
-const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
+
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
 // 表单验证规则
 const rules = ref({
-  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
-  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
-  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
-// 第几条数据选择
-const listIndex = ref(0)
-interface IRowIndexType {
-  $index: number
-}
-const uploadIndex = (row: IRowIndexType) => {
-  listIndex.value = row.$index
-}
-// 选择标准配套设备
-const equipmentDialog = ref()
-// 点击标准配套设备选择按钮
-const chooseList = (row: object, index: number) => {
-  listIndex.value = index
-  equipmentDialog.value.initDialog()
-}
-// 测试数据
-const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
-  certificateNo: '199926465422', // 证书编号
-  authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
-}
-// 点击增加行
-const addRoow = () => {
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
-    ElMessage.warning('请完善上一条设备信息')
-  }
-  else {
-    fromListInfo.value.applyEquipmentList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-    fromListInfo.value.fixedAssetsList.push({
-      equipmentName: '', // 设备名称
-      equipmentNo: '', // 设备编号
-      modelNo: '', // 型号
-      mesureResult: '',
-      validDate: '', // 到期时间
-      id: '', // 主键
-      equipmentId: '', // 设备id
-      standardApplyId: '',
-    })
-  }
-}
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => {
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
-  }
-  else {
-    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
-  }
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -397,20 +317,6 @@
   fileRef.value.click()
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -554,54 +460,6 @@
 ]
 // 审批完成后的回调
 const approvalSuccess = () => {}
-// 选择标准装置弹窗ref
-const standarDialog = ref()
-// 选择了标准名称后
-const standardChange = () => {
-  standarDialog.value.initDialog()
-}
-
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除设备行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除文件行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 文件表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
 watch(
   () => formInline.value,
   (newVal) => {
@@ -636,10 +494,132 @@
     formInline.value = res.data
   })
 }
-// 选择标准装置完成之后
-const StandarAddRow = (data: dataReturn) => {
-  getStandarInfo(data.id)
+
+// ----------------------------------------所用设备-------------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.equipmentInfoList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
 }
+
+const handleSelectionChangeMeasureDevice = (e: any) => {
+  checkoutMeasureDeviceList.value = e
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.equipmentInfoList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// ------------------------------------------技术文件----------------------------------
+// 点击技术文件增加行
+const addFilesRow = () => {
+  console.log(formInline.value.fileList)
+
+  const index = formInline.value.fileList.findIndex((item: fileListType) =>
+    !item.fileNo && !item.fileName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条文件信息')
+    return
+  }
+  formInline.value.fileList.push({
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    fileCode: '', // 文件号
+  })
+}
+
+// 技术文件表格多选
+const handleSelectionChangeFiles = (e: any) => {
+  checkoutFilesList.value = e
+}
+// 点击技术文件删除行
+const delFilesRow = () => {
+  if (checkoutFilesList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutFilesList.value.forEach((item: fileListType) => {
+      formInline.value.fileList.forEach((element: fileListType, index: number) => {
+        if (element.fileNo === item.fileNo) {
+          formInline.value.fileList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择文件编号
+const handleClickFiles = (index: number) => {
+  filesVisible.value = true
+  selectFliesIndex.value = index
+}
+// 修改技术文件对话框显隐
+const changeFilesVisible = (val: boolean) => {
+  filesVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutFiles = (val: any) => {
+  if (val && val.length) {
+    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+    if (index !== -1) {
+      ElMessage.warning('此文件已添加过')
+      return
+    }
+    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+  }
+}
+
+// -------------------------------------------底部-------------------------------------------
 </script>
 
 <template>
@@ -721,12 +701,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -742,12 +720,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="电子签章:"
-              prop="signName"
-            >
+            <el-form-item label="电子签章:" prop="signName">
               <el-input
-                v-model.trim="fromListInfo.signName"
+                v-model.trim="formInline.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -765,7 +740,7 @@
           <el-col :span="6">
             <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="fromListInfo.approvalSignName"
+                v-model.trim="formInline.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -780,24 +755,10 @@
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="证书报告附件:">
-              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
-              <span v-else-if="pageType === 'detail'">无</span>
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordName">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
               <el-input
-                v-model.trim="fromListInfo.originalRecordName"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -813,9 +774,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="calibrationPlace">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
-                v-model.trim="fromListInfo.calibrationPlace"
+                v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -824,9 +785,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.temperature"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -835,9 +796,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="humidity">
+            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
               <el-input
-                v-model.trim="fromListInfo.humidity"
+                v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -845,12 +806,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -859,9 +818,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -870,9 +829,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="leaveNo">
+            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.leaveNo"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -881,9 +840,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -891,12 +850,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -905,9 +862,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="customerId">
+            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
               <el-input
-                v-model.trim="fromListInfo.customerId"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -916,9 +873,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="customerName">
+            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.customerName"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -927,9 +884,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="customerPhone">
+            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.customerPhone"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -940,9 +897,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="customerLocation">
+            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.customerLocation"
+                v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -955,7 +912,7 @@
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.censorshipUser"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -966,7 +923,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.phone"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -977,7 +934,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedDeliveryTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -989,9 +946,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.expectedCompletionTime"
+                v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1005,9 +962,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -1029,26 +986,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeMeasureDevice"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1061,6 +1030,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1079,7 +1049,8 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  type="primary"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1091,18 +1062,18 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
+        <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
-        <el-button type="info" @click="removeRow('2')">
+        <el-button type="info" @click="delFilesRow">
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fileList"
+        :data="formInline.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChangeFiles"
       >
         <el-table-column
           v-if="pageType !== 'detail'"
@@ -1115,6 +1086,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -1133,6 +1105,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
+                  @click="handleClickFiles(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1165,7 +1138,9 @@
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <!-- 选择所依据的技术文件（在用的计量规程） -->
+  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index d3bd94b..323bbf3 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -108,3 +108,14 @@
   taskId: string // 任务id
   processId: string // 流程实例id
 }
+
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f1a3dd8..b4a9d9c 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '', // 是否加急
-  sampleBelong: '', // 样品属性
+  isUrgent: '2', // 是否加急 //2全部
+  sampleBelong: '2', // 样品属性 //2全部
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -176,8 +176,8 @@
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '', // 是否加急
-    sampleBelong: '', // 样品属性
+    isUrgent: '2', // 是否加急
+    sampleBelong: '2', // 样品属性
     sampleStatus: '',
     offset: 1,
     limit: 20,
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 4ee6d72..bbaae75 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -73,7 +73,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 1cc8334..acbf354 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -111,16 +111,20 @@
 
 // 获取检定记录
 const fetchMeasureRecords = (query = null) => {
-  getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
-    dataList.value.measureRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
 }
 
 // 获取检定证书
 const fetchCertifications = (query = null) => {
-  getCertification({ id: infoId.value }).then((res) => {
-    dataList.value.certificationRecords = res.data.rows
-  })
+  if (pageType.value === 'detail') {
+    getCertification({ id: infoId.value }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
+  }
 }
 
 // 菜单
diff --git a/src/views/login.vue b/src/views/login.vue
index 1f1a316..bd0d64d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,8 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { RSAencrypt } from '@/utils/security'
+import { RSAdecrypt, RSAencrypt } from '@/utils/security'
+import { getPrivateKey, removePrivateKey } from '@/utils/auth'
 const route = useRoute()
 const router = useRouter()
 
@@ -88,10 +89,18 @@
             })
             loading.value = false
             if (loginForm.value.remember) {
+              // 保存用户名
               localStorage.setItem('login_username', loginForm.value.username)
+              // 保存 加密密码串
+              localStorage.setItem('login_password', finalForm.password)
             }
             else {
+              // 移除用户名
               localStorage.removeItem('login_username')
+              // 移除 加密密码串
+              localStorage.removeItem('login_password')
+              // 移除私钥
+              removePrivateKey()
             }
             router.push(redirect.value)
           })
@@ -186,8 +195,12 @@
   loginForm.value.password = '111111'
   handleLogin()
 }
-onBeforeMount(() => {
+onBeforeMount(async () => {
   loginForm.value.username = localStorage.login_username || ''
+  if (localStorage.login_username) {
+    const passwoed = await RSAdecrypt(localStorage.login_password)
+    loginForm.value.password = passwoed
+  }
   getBaseConfig()
 })
 </script>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index cdad53e..57e0f82 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -7,11 +7,11 @@
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -113,15 +113,36 @@
       type: 'warning',
     },
   ).then(() => {
-    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
-      if (res.code === 200) {
+    if (props.status === '1') { // 草稿箱
+      getListDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else {
+      if (!row.taskId) {
         ElMessage({
-          type: 'success',
-          message: '删除成功',
+          type: 'warning',
+          message: '缺少taskId, 不允许删除',
         })
-        fetchData(true)
       }
-    })
+      else {
+        getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
+    }
   })
 }
 
diff --git a/src/views/system/area/area-interface.ts b/src/views/system/area/area-interface.ts
index 627a360..904997e 100644
--- a/src/views/system/area/area-interface.ts
+++ b/src/views/system/area/area-interface.ts
@@ -7,7 +7,7 @@
 }
 
 export interface IareaForm {
-  id: string // 编号
+  id?: string // 编号
   pid: string // 父级编号
   pName: string // 父级名称
   areaName: string // 区域名
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 8256924..70384ba 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -6,7 +6,7 @@
 import AreaSelectTree from './areaSelectTree.vue'
 import type { IareaForm } from './area-interface'
 import { addArea, getAreaType, updateArea } from '@/api/system/area'
-const emits = defineEmits(['watchChild'])
+const emits = defineEmits(['watchChild', 'refresh'])
 const dataFormRef = ref()
 const areaSelect = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -18,7 +18,7 @@
   areaName: '', // 区域名
   simpleName: '', // 别名，
   level: '',
-  num: 99, // 排序
+  num: 1, // 排序
 }) // 表单
 const areaSelectShow = ref(false)
 const areaLevelList = ref([]) as any // 区域树列表数据
@@ -28,7 +28,7 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
   areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
   simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
   pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
@@ -49,7 +49,7 @@
     areaName: '', // 区域名
     simpleName: '', // 别名，
     level: '',
-    num: 99, // 排序
+    num: 4, // 排序
   }
 }
 // 获取区域类型
@@ -118,6 +118,10 @@
             nextTick(() => {
               dataFormRef.value.clearValidate()
             })
+            // 通知父组件刷新状态
+            setTimeout(() => {
+              emits('refresh')
+            })
           }).catch(() => { // 选否,关闭窗口，并刷新页面
             emits('watchChild')
             dialogFormVisible.value = false
@@ -143,6 +147,9 @@
           })
           dataFormRef.value.clearValidate()
           emits('watchChild')
+          setTimeout(() => {
+            emits('refresh')
+          })
           dialogFormVisible.value = false
         }
       }).catch((_) => { // 异常情况，loading置为false
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 38fd8ae..deb0bfe 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -44,6 +44,7 @@
 // 获取区域数据
 const fetchData = () => {
   listLoading.value = true
+  list.value = []
   getAreaByPid('0').then((res) => {
     list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     list.value = toTreeList(list.value)
@@ -118,7 +119,7 @@
 ) => {
   getAreaByPid(row.id).then((res) => {
     console.log(res.data, 'res.data')
-    const data = res.data.map((item: any) => ({ ...item, hasChildren: item.level < 4 }))
+    const data = res.data.map((item: any) => ({ ...item, hasChildren: true }))
     resolve(data)
   })
 }
@@ -150,7 +151,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" />
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watch-child="fetchData" @refresh="fetchData" />
   </app-container>
 </template>
 
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 64ffbc4..95dd3c2 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -11,16 +11,16 @@
 const { proxy } = getCurrentInstance() as any
 
 // 默认查询条件
-const defaultQuery = {
-  keyword: '',
-}
+// const defaultQuery = {
+//   deptName: '',
+// }
 // 查询条件
-const listQuery = reactive({ ...defaultQuery })
+const listQuery = reactive({ deptName: '' })
 // 搜索重置
-function reset() {
-  Object.assign(listQuery, defaultQuery)
-  fetchData()
-}
+// function reset() {
+//   Object.assign(listQuery, defaultQuery)
+//   fetchData()
+// }
 // 表格表头
 const columns = ref([
   { text: '组织名称', value: 'simpleName', align: 'left' },
@@ -39,6 +39,7 @@
 // 查询数据
 function fetchData() {
   loading.value = true
+  console.log(listQuery, 'listQuery')
   getDeptList(listQuery).then((res) => {
     const treeData = toTreeList<DeptInfo>(res.data.list, '0', false)
     list.value = treeData
@@ -99,7 +100,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="组织名称" />
+        <el-input v-model="listQuery.deptName" placeholder="组织名称" clearable />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index d5d597a..14b11aa 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -138,11 +138,17 @@
 const fileUrl = ref('')
 const downRef = ref()
 const exportSele = (row: templateType) => {
-  getPhotoUrl(row.minioFileName).then((res) => {
-    fileUrl.value = res.data
-    downRef.value.click()
-  })
-//  下载模板
+  if (row.minioFileName) {
+    getPhotoUrl(row.minioFileName).then((res) => {
+      fileUrl.value = res.data
+      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+    }).catch(() => {
+      ElMessage.error('下载失败')
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
 }
 // 表格被选中的行
 const selectList = ref<templateType[]>([])
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 6cb2d55..c5732f4 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -136,11 +136,17 @@
 const fileUrl = ref('')
 const downRef = ref()
 const exportSele = (row: templateType) => {
-  getPhotoUrl(row.minioFileName).then((res) => {
-    fileUrl.value = res.data
-    downRef.value.click()
-  })
-//  下载模板
+  if (row.minioFileName) {
+    getPhotoUrl(row.minioFileName).then((res) => {
+      fileUrl.value = res.data
+      fileUrl.value ? downRef.value.click() : ElMessage('无可下载内容')
+    }).catch(() => {
+      ElMessage.error('下载失败')
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
 }
 // 表格被选中的行
 const selectList = ref<templateType[]>([])