diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index eb506ec..6b440d0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,15 +2,17 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
+import UserListDialog from './userListDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const props = defineProps({
   infoId: {
-    type: String,
-    default: '0',
+    type: String || Number,
+    default: '',
   },
   buttonType: {
     type: String,
@@ -66,6 +68,53 @@
   updateTime: null,
   version: null,
 })
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyEquipmentList: [
+    {
+      createTime: '',
+      createUser: 0,
+      equipmentId: 0,
+      id: 0,
+      isDel: 0,
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  applyNo: '',
+  applyType: '',
+  applyTypeName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: '',
+  createUser: '',
+  fileList: [
+    {
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  id: '',
+  isDel: 0,
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: '',
+  version: '',
+})
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -132,7 +181,6 @@
 }
 // 数据
 const list = ref<object[]>([
-  { name: '王五' },
 ])
 // 标准配套设备更换表格总数
 const total = ref(0)
@@ -157,48 +205,68 @@
   text: string
   value: string
   align: string
+  required: Boolean
+  choose: Boolean
 }
+// 申请文档列表
+const filesList = ref([])
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
   {
     text: '设备编号',
     value: 'bianhao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '型号',
     value: 'xinghao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '测量范围',
     value: 'fanwei',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '使用部门',
     value: 'bumen',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定时间',
     value: 'time',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定结果',
     value: 'jieguo',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '有效日期',
     value: 'riqi',
     align: 'center',
+    required: true,
+    choose: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -209,26 +277,34 @@
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
 // 申请文档表头
-const columnsFiles = ref<object[]>([
+const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '上传时间',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '文件说明',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '附件文档',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
 ])
 // 标准配套设备更换表格分页
@@ -238,6 +314,8 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框
+const standardList = ref([])
 // 关闭
 const close = () => {
   emit('close')
@@ -265,6 +343,24 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
+// 获取数据
+const fetchData = () => {
+  const params = {
+    standardNo: '',
+    standardName: '',
+    category: '',
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 1000000,
+  }
+  getStandardList(params).then((response) => {
+    standardList.value = response.data.rows
+  })
+}
+fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
   const fd = new FormData()
@@ -290,6 +386,22 @@
 
   )
 }
+// 选择标准配套设备
+const userListDialog = ref()
+
+// 点击标准配套设备选择按钮
+const chooseList = (row: object) => {
+  console.log(row)
+  userListDialog.value.initDialog()
+}
+// 选择完成之后的回调
+const confirmPerson = (e: any) => {
+  console.log(e)
+}
+// 增加申请文档列表
+const addRow = () => {
+  filesList.value.push({})
+}
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -328,8 +440,8 @@
   formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+const getInfo = (id: string | number) => {
+  getStandardListDetail({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -339,7 +451,7 @@
   })
 }
 if (props.buttonType !== '') {
-  getInfo()
+  getInfo(props.infoId)
 }
 
 // 提交
@@ -351,7 +463,9 @@
 // 点击顶部一排按钮
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
-    console.log(item)
+    getStandardLisAdd(fromListInfo.value).then((res) => {
+      console.log(res)
+    })
   }
   else {
     if (item === '同意') {
@@ -366,10 +480,21 @@
     applyShow.value = true
   }
 }
+// 选择了标准名称后
+const standardChange = (e: any) => {
+  getInfo(e)
+  formInline.value.standardOwner = e
+}
 // 点击增加行
 const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
+  // const params = {
+  //   equipmentName: '',
+  //   equipmentNo: '',
+  //   equipmentType: '',
+  //   depreciationMethod: '',
+
+  // }
+  list.value.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -381,7 +506,7 @@
   handleClose()
 }
 // 标准配套设备更换表格删除行
-const removeRow = () => {
+const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
     ElMessageBox.confirm(
       '确认删除选中的数据吗？',
@@ -392,11 +517,20 @@
         type: 'warning',
       },
     ).then(() => {
+      if (type == '1') {
       // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+        list.value = list.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+      // 删除行
+        filesList.value = filesList.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
     })
   }
   else {
@@ -433,7 +567,12 @@
         基本信息
       </h4>
       <div>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item)"
+        >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -462,11 +601,21 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
+              <el-select
+                v-model.trim="fromListInfo.id"
+                clearable
                 placeholder="标准名称"
+                size="default"
                 :disabled="buttonType === '查看'"
-              />
+                @change="standardChange"
+              >
+                <el-option
+                  v-for="item in standardList"
+                  :key="item.id"
+                  :label="item.standardName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -474,7 +623,7 @@
               <el-input
                 v-model.trim="formInline.projectNo"
                 placeholder="项目编号"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -483,7 +632,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -494,7 +643,7 @@
               <el-input
                 v-model.trim="formInline.organizeNo"
                 placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -506,7 +655,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -517,7 +666,7 @@
                 clearable
                 placeholder="标准负责人"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardOwnerOptions"
@@ -533,7 +682,7 @@
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -546,7 +695,7 @@
                 clearable
                 placeholder="类别"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -564,7 +713,7 @@
                 clearable
                 placeholder="标准等级"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardLevelList"
@@ -582,7 +731,7 @@
                 clearable
                 placeholder="传递范围"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in transmitRangeList"
@@ -598,7 +747,7 @@
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 placeholder="投资总额"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -612,7 +761,7 @@
                 placeholder="请选择筹建日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -623,7 +772,7 @@
                 clearable
                 placeholder="标准所在实验室"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
                 @clear="clearDeptList"
               >
                 <el-option
@@ -641,7 +790,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -650,7 +799,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -663,7 +812,7 @@
                 clearable
                 placeholder="管理状态"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardManagerStateList"
@@ -681,7 +830,7 @@
                 clearable
                 placeholder="计量专业"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in measureMajorList"
@@ -697,7 +846,7 @@
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -709,7 +858,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -721,7 +870,7 @@
                 v-model.trim="formInline.uncertainty"
                 style="width: 500px;"
                 placeholder="不确定度"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -733,7 +882,7 @@
                 v-model.trim="formInline.mesureRange"
                 placeholder="测量范围"
                 style="width: 500px;"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -747,7 +896,7 @@
               <el-input
                 v-model.trim="formInline.standardTemperature"
                 placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -756,7 +905,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -807,7 +956,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
               <el-upload
@@ -826,7 +975,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -834,7 +983,7 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -848,36 +997,123 @@
           <el-button v-if="buttonType !== '查看'" type="primary">
             批量选择
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="primary"
+            @click="addRoow"
+          >
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('1')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="buttonType === '查看'"
+                  @click="chooseList(scope.row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="header">
         <div class="title">
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('2')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
+      <el-table
+        :data="filesList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                    上传
+                  </el-button>
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="buttonType === '查看'" class="header">
         <div class="title">
           审批流程
         </div>
@@ -885,94 +1121,78 @@
     </div>
   </app-container>
   <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
       <el-button type="info" @click="applyListClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
+  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
 <style lang="scss" scoped>
@@ -997,6 +1217,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-top: 2vh;
   padding: 5px;
   width: 100%;
   height: 6vh;

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index eb506ec..6b440d0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,15 +2,17 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
+import UserListDialog from './userListDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const props = defineProps({
   infoId: {
-    type: String,
-    default: '0',
+    type: String || Number,
+    default: '',
   },
   buttonType: {
     type: String,
@@ -66,6 +68,53 @@
   updateTime: null,
   version: null,
 })
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyEquipmentList: [
+    {
+      createTime: '',
+      createUser: 0,
+      equipmentId: 0,
+      id: 0,
+      isDel: 0,
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  applyNo: '',
+  applyType: '',
+  applyTypeName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: '',
+  createUser: '',
+  fileList: [
+    {
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  id: '',
+  isDel: 0,
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: '',
+  version: '',
+})
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -132,7 +181,6 @@
 }
 // 数据
 const list = ref<object[]>([
-  { name: '王五' },
 ])
 // 标准配套设备更换表格总数
 const total = ref(0)
@@ -157,48 +205,68 @@
   text: string
   value: string
   align: string
+  required: Boolean
+  choose: Boolean
 }
+// 申请文档列表
+const filesList = ref([])
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
   {
     text: '设备编号',
     value: 'bianhao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '型号',
     value: 'xinghao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '测量范围',
     value: 'fanwei',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '使用部门',
     value: 'bumen',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定时间',
     value: 'time',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定结果',
     value: 'jieguo',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '有效日期',
     value: 'riqi',
     align: 'center',
+    required: true,
+    choose: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -209,26 +277,34 @@
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
 // 申请文档表头
-const columnsFiles = ref<object[]>([
+const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '上传时间',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '文件说明',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '附件文档',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
 ])
 // 标准配套设备更换表格分页
@@ -238,6 +314,8 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框
+const standardList = ref([])
 // 关闭
 const close = () => {
   emit('close')
@@ -265,6 +343,24 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
+// 获取数据
+const fetchData = () => {
+  const params = {
+    standardNo: '',
+    standardName: '',
+    category: '',
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 1000000,
+  }
+  getStandardList(params).then((response) => {
+    standardList.value = response.data.rows
+  })
+}
+fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
   const fd = new FormData()
@@ -290,6 +386,22 @@
 
   )
 }
+// 选择标准配套设备
+const userListDialog = ref()
+
+// 点击标准配套设备选择按钮
+const chooseList = (row: object) => {
+  console.log(row)
+  userListDialog.value.initDialog()
+}
+// 选择完成之后的回调
+const confirmPerson = (e: any) => {
+  console.log(e)
+}
+// 增加申请文档列表
+const addRow = () => {
+  filesList.value.push({})
+}
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -328,8 +440,8 @@
   formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+const getInfo = (id: string | number) => {
+  getStandardListDetail({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -339,7 +451,7 @@
   })
 }
 if (props.buttonType !== '') {
-  getInfo()
+  getInfo(props.infoId)
 }
 
 // 提交
@@ -351,7 +463,9 @@
 // 点击顶部一排按钮
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
-    console.log(item)
+    getStandardLisAdd(fromListInfo.value).then((res) => {
+      console.log(res)
+    })
   }
   else {
     if (item === '同意') {
@@ -366,10 +480,21 @@
     applyShow.value = true
   }
 }
+// 选择了标准名称后
+const standardChange = (e: any) => {
+  getInfo(e)
+  formInline.value.standardOwner = e
+}
 // 点击增加行
 const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
+  // const params = {
+  //   equipmentName: '',
+  //   equipmentNo: '',
+  //   equipmentType: '',
+  //   depreciationMethod: '',
+
+  // }
+  list.value.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -381,7 +506,7 @@
   handleClose()
 }
 // 标准配套设备更换表格删除行
-const removeRow = () => {
+const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
     ElMessageBox.confirm(
       '确认删除选中的数据吗？',
@@ -392,11 +517,20 @@
         type: 'warning',
       },
     ).then(() => {
+      if (type == '1') {
       // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+        list.value = list.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+      // 删除行
+        filesList.value = filesList.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
     })
   }
   else {
@@ -433,7 +567,12 @@
         基本信息
       </h4>
       <div>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item)"
+        >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -462,11 +601,21 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
+              <el-select
+                v-model.trim="fromListInfo.id"
+                clearable
                 placeholder="标准名称"
+                size="default"
                 :disabled="buttonType === '查看'"
-              />
+                @change="standardChange"
+              >
+                <el-option
+                  v-for="item in standardList"
+                  :key="item.id"
+                  :label="item.standardName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -474,7 +623,7 @@
               <el-input
                 v-model.trim="formInline.projectNo"
                 placeholder="项目编号"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -483,7 +632,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -494,7 +643,7 @@
               <el-input
                 v-model.trim="formInline.organizeNo"
                 placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -506,7 +655,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -517,7 +666,7 @@
                 clearable
                 placeholder="标准负责人"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardOwnerOptions"
@@ -533,7 +682,7 @@
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -546,7 +695,7 @@
                 clearable
                 placeholder="类别"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -564,7 +713,7 @@
                 clearable
                 placeholder="标准等级"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardLevelList"
@@ -582,7 +731,7 @@
                 clearable
                 placeholder="传递范围"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in transmitRangeList"
@@ -598,7 +747,7 @@
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 placeholder="投资总额"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -612,7 +761,7 @@
                 placeholder="请选择筹建日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -623,7 +772,7 @@
                 clearable
                 placeholder="标准所在实验室"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
                 @clear="clearDeptList"
               >
                 <el-option
@@ -641,7 +790,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -650,7 +799,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -663,7 +812,7 @@
                 clearable
                 placeholder="管理状态"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardManagerStateList"
@@ -681,7 +830,7 @@
                 clearable
                 placeholder="计量专业"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in measureMajorList"
@@ -697,7 +846,7 @@
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -709,7 +858,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -721,7 +870,7 @@
                 v-model.trim="formInline.uncertainty"
                 style="width: 500px;"
                 placeholder="不确定度"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -733,7 +882,7 @@
                 v-model.trim="formInline.mesureRange"
                 placeholder="测量范围"
                 style="width: 500px;"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -747,7 +896,7 @@
               <el-input
                 v-model.trim="formInline.standardTemperature"
                 placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -756,7 +905,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -807,7 +956,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
               <el-upload
@@ -826,7 +975,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -834,7 +983,7 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -848,36 +997,123 @@
           <el-button v-if="buttonType !== '查看'" type="primary">
             批量选择
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="primary"
+            @click="addRoow"
+          >
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('1')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="buttonType === '查看'"
+                  @click="chooseList(scope.row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="header">
         <div class="title">
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('2')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
+      <el-table
+        :data="filesList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                    上传
+                  </el-button>
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="buttonType === '查看'" class="header">
         <div class="title">
           审批流程
         </div>
@@ -885,94 +1121,78 @@
     </div>
   </app-container>
   <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
       <el-button type="info" @click="applyListClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
+  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
 <style lang="scss" scoped>
@@ -997,6 +1217,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-top: 2vh;
   padding: 5px;
   width: 100%;
   height: 6vh;
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
new file mode 100644
index 0000000..bbaaa1f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -0,0 +1,151 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  name: '', // 姓名
+})
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'xinghao',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'fanwei',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'bumen',
+    align: 'center',
+  },
+  {
+    text: '检定时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定结果',
+    value: 'jieguo',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'riqi',
+    align: 'center',
+  },
+])
+const list = ref([{ name: '张三' }])
+// 搜索
+const search = () => {
+  list.value = props.list.filter(item => item.name === listQuery.value.name)
+}
+const changePage = (e: any) => {
+  console.log(e)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '', // 姓名
+  }
+  list.value = props.list
+}
+// 点击保存
+const submitForm = () => {
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 监听数据变化
+watch(
+  [() => props.list], ([newNums], [oldNums]) => {
+    list.value = newNums
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index eb506ec..6b440d0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,15 +2,17 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
+import UserListDialog from './userListDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const props = defineProps({
   infoId: {
-    type: String,
-    default: '0',
+    type: String || Number,
+    default: '',
   },
   buttonType: {
     type: String,
@@ -66,6 +68,53 @@
   updateTime: null,
   version: null,
 })
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyEquipmentList: [
+    {
+      createTime: '',
+      createUser: 0,
+      equipmentId: 0,
+      id: 0,
+      isDel: 0,
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  applyNo: '',
+  applyType: '',
+  applyTypeName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: '',
+  createUser: '',
+  fileList: [
+    {
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  id: '',
+  isDel: 0,
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: '',
+  version: '',
+})
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -132,7 +181,6 @@
 }
 // 数据
 const list = ref<object[]>([
-  { name: '王五' },
 ])
 // 标准配套设备更换表格总数
 const total = ref(0)
@@ -157,48 +205,68 @@
   text: string
   value: string
   align: string
+  required: Boolean
+  choose: Boolean
 }
+// 申请文档列表
+const filesList = ref([])
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
   {
     text: '设备编号',
     value: 'bianhao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '型号',
     value: 'xinghao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '测量范围',
     value: 'fanwei',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '使用部门',
     value: 'bumen',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定时间',
     value: 'time',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定结果',
     value: 'jieguo',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '有效日期',
     value: 'riqi',
     align: 'center',
+    required: true,
+    choose: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -209,26 +277,34 @@
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
 // 申请文档表头
-const columnsFiles = ref<object[]>([
+const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '上传时间',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '文件说明',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '附件文档',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
 ])
 // 标准配套设备更换表格分页
@@ -238,6 +314,8 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框
+const standardList = ref([])
 // 关闭
 const close = () => {
   emit('close')
@@ -265,6 +343,24 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
+// 获取数据
+const fetchData = () => {
+  const params = {
+    standardNo: '',
+    standardName: '',
+    category: '',
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 1000000,
+  }
+  getStandardList(params).then((response) => {
+    standardList.value = response.data.rows
+  })
+}
+fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
   const fd = new FormData()
@@ -290,6 +386,22 @@
 
   )
 }
+// 选择标准配套设备
+const userListDialog = ref()
+
+// 点击标准配套设备选择按钮
+const chooseList = (row: object) => {
+  console.log(row)
+  userListDialog.value.initDialog()
+}
+// 选择完成之后的回调
+const confirmPerson = (e: any) => {
+  console.log(e)
+}
+// 增加申请文档列表
+const addRow = () => {
+  filesList.value.push({})
+}
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -328,8 +440,8 @@
   formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+const getInfo = (id: string | number) => {
+  getStandardListDetail({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -339,7 +451,7 @@
   })
 }
 if (props.buttonType !== '') {
-  getInfo()
+  getInfo(props.infoId)
 }
 
 // 提交
@@ -351,7 +463,9 @@
 // 点击顶部一排按钮
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
-    console.log(item)
+    getStandardLisAdd(fromListInfo.value).then((res) => {
+      console.log(res)
+    })
   }
   else {
     if (item === '同意') {
@@ -366,10 +480,21 @@
     applyShow.value = true
   }
 }
+// 选择了标准名称后
+const standardChange = (e: any) => {
+  getInfo(e)
+  formInline.value.standardOwner = e
+}
 // 点击增加行
 const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
+  // const params = {
+  //   equipmentName: '',
+  //   equipmentNo: '',
+  //   equipmentType: '',
+  //   depreciationMethod: '',
+
+  // }
+  list.value.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -381,7 +506,7 @@
   handleClose()
 }
 // 标准配套设备更换表格删除行
-const removeRow = () => {
+const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
     ElMessageBox.confirm(
       '确认删除选中的数据吗？',
@@ -392,11 +517,20 @@
         type: 'warning',
       },
     ).then(() => {
+      if (type == '1') {
       // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+        list.value = list.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+      // 删除行
+        filesList.value = filesList.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
     })
   }
   else {
@@ -433,7 +567,12 @@
         基本信息
       </h4>
       <div>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item)"
+        >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -462,11 +601,21 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
+              <el-select
+                v-model.trim="fromListInfo.id"
+                clearable
                 placeholder="标准名称"
+                size="default"
                 :disabled="buttonType === '查看'"
-              />
+                @change="standardChange"
+              >
+                <el-option
+                  v-for="item in standardList"
+                  :key="item.id"
+                  :label="item.standardName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -474,7 +623,7 @@
               <el-input
                 v-model.trim="formInline.projectNo"
                 placeholder="项目编号"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -483,7 +632,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -494,7 +643,7 @@
               <el-input
                 v-model.trim="formInline.organizeNo"
                 placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -506,7 +655,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -517,7 +666,7 @@
                 clearable
                 placeholder="标准负责人"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardOwnerOptions"
@@ -533,7 +682,7 @@
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -546,7 +695,7 @@
                 clearable
                 placeholder="类别"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -564,7 +713,7 @@
                 clearable
                 placeholder="标准等级"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardLevelList"
@@ -582,7 +731,7 @@
                 clearable
                 placeholder="传递范围"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in transmitRangeList"
@@ -598,7 +747,7 @@
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 placeholder="投资总额"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -612,7 +761,7 @@
                 placeholder="请选择筹建日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -623,7 +772,7 @@
                 clearable
                 placeholder="标准所在实验室"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
                 @clear="clearDeptList"
               >
                 <el-option
@@ -641,7 +790,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -650,7 +799,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -663,7 +812,7 @@
                 clearable
                 placeholder="管理状态"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardManagerStateList"
@@ -681,7 +830,7 @@
                 clearable
                 placeholder="计量专业"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in measureMajorList"
@@ -697,7 +846,7 @@
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -709,7 +858,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -721,7 +870,7 @@
                 v-model.trim="formInline.uncertainty"
                 style="width: 500px;"
                 placeholder="不确定度"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -733,7 +882,7 @@
                 v-model.trim="formInline.mesureRange"
                 placeholder="测量范围"
                 style="width: 500px;"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -747,7 +896,7 @@
               <el-input
                 v-model.trim="formInline.standardTemperature"
                 placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -756,7 +905,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -807,7 +956,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
               <el-upload
@@ -826,7 +975,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -834,7 +983,7 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -848,36 +997,123 @@
           <el-button v-if="buttonType !== '查看'" type="primary">
             批量选择
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="primary"
+            @click="addRoow"
+          >
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('1')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="buttonType === '查看'"
+                  @click="chooseList(scope.row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="header">
         <div class="title">
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('2')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
+      <el-table
+        :data="filesList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                    上传
+                  </el-button>
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="buttonType === '查看'" class="header">
         <div class="title">
           审批流程
         </div>
@@ -885,94 +1121,78 @@
     </div>
   </app-container>
   <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
       <el-button type="info" @click="applyListClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
+  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
 <style lang="scss" scoped>
@@ -997,6 +1217,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-top: 2vh;
   padding: 5px;
   width: 100%;
   height: 6vh;
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
new file mode 100644
index 0000000..bbaaa1f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -0,0 +1,151 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  name: '', // 姓名
+})
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'xinghao',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'fanwei',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'bumen',
+    align: 'center',
+  },
+  {
+    text: '检定时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定结果',
+    value: 'jieguo',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'riqi',
+    align: 'center',
+  },
+])
+const list = ref([{ name: '张三' }])
+// 搜索
+const search = () => {
+  list.value = props.list.filter(item => item.name === listQuery.value.name)
+}
+const changePage = (e: any) => {
+  console.log(e)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '', // 姓名
+  }
+  list.value = props.list
+}
+// 点击保存
+const submitForm = () => {
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 监听数据变化
+watch(
+  [() => props.list], ([newNums], [oldNums]) => {
+    list.value = newNums
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index a26eb9d..d7a0f7f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -19,7 +19,7 @@
   deptId: string
 }
 
-export interface IlistTypes {
+export interface IlistQuery {
   applyNo: string
   applyStatus: string
   applyType: string
@@ -29,4 +29,19 @@
   organizeNo: string
   standardName: string
   standardNo: string
+  limit: number
+  offset: number
+}
+
+export interface IlistTypes {
+  applyNo: string
+  applyTypeName: string
+  standardNo: string
+  standardName: string
+  constructionStandardUnitName: string
+  standardOwner: string
+  applyDept: string
+  createUser: string
+  createTime: string
+  approvalStatusName: string
 }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index eb506ec..6b440d0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,15 +2,17 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
+import UserListDialog from './userListDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const props = defineProps({
   infoId: {
-    type: String,
-    default: '0',
+    type: String || Number,
+    default: '',
   },
   buttonType: {
     type: String,
@@ -66,6 +68,53 @@
   updateTime: null,
   version: null,
 })
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyEquipmentList: [
+    {
+      createTime: '',
+      createUser: 0,
+      equipmentId: 0,
+      id: 0,
+      isDel: 0,
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  applyNo: '',
+  applyType: '',
+  applyTypeName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: '',
+  createUser: '',
+  fileList: [
+    {
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  id: '',
+  isDel: 0,
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: '',
+  version: '',
+})
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -132,7 +181,6 @@
 }
 // 数据
 const list = ref<object[]>([
-  { name: '王五' },
 ])
 // 标准配套设备更换表格总数
 const total = ref(0)
@@ -157,48 +205,68 @@
   text: string
   value: string
   align: string
+  required: Boolean
+  choose: Boolean
 }
+// 申请文档列表
+const filesList = ref([])
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
   {
     text: '设备编号',
     value: 'bianhao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '型号',
     value: 'xinghao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '测量范围',
     value: 'fanwei',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '使用部门',
     value: 'bumen',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定时间',
     value: 'time',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定结果',
     value: 'jieguo',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '有效日期',
     value: 'riqi',
     align: 'center',
+    required: true,
+    choose: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -209,26 +277,34 @@
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
 // 申请文档表头
-const columnsFiles = ref<object[]>([
+const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '上传时间',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '文件说明',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '附件文档',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
 ])
 // 标准配套设备更换表格分页
@@ -238,6 +314,8 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框
+const standardList = ref([])
 // 关闭
 const close = () => {
   emit('close')
@@ -265,6 +343,24 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
+// 获取数据
+const fetchData = () => {
+  const params = {
+    standardNo: '',
+    standardName: '',
+    category: '',
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 1000000,
+  }
+  getStandardList(params).then((response) => {
+    standardList.value = response.data.rows
+  })
+}
+fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
   const fd = new FormData()
@@ -290,6 +386,22 @@
 
   )
 }
+// 选择标准配套设备
+const userListDialog = ref()
+
+// 点击标准配套设备选择按钮
+const chooseList = (row: object) => {
+  console.log(row)
+  userListDialog.value.initDialog()
+}
+// 选择完成之后的回调
+const confirmPerson = (e: any) => {
+  console.log(e)
+}
+// 增加申请文档列表
+const addRow = () => {
+  filesList.value.push({})
+}
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -328,8 +440,8 @@
   formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+const getInfo = (id: string | number) => {
+  getStandardListDetail({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -339,7 +451,7 @@
   })
 }
 if (props.buttonType !== '') {
-  getInfo()
+  getInfo(props.infoId)
 }
 
 // 提交
@@ -351,7 +463,9 @@
 // 点击顶部一排按钮
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
-    console.log(item)
+    getStandardLisAdd(fromListInfo.value).then((res) => {
+      console.log(res)
+    })
   }
   else {
     if (item === '同意') {
@@ -366,10 +480,21 @@
     applyShow.value = true
   }
 }
+// 选择了标准名称后
+const standardChange = (e: any) => {
+  getInfo(e)
+  formInline.value.standardOwner = e
+}
 // 点击增加行
 const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
+  // const params = {
+  //   equipmentName: '',
+  //   equipmentNo: '',
+  //   equipmentType: '',
+  //   depreciationMethod: '',
+
+  // }
+  list.value.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -381,7 +506,7 @@
   handleClose()
 }
 // 标准配套设备更换表格删除行
-const removeRow = () => {
+const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
     ElMessageBox.confirm(
       '确认删除选中的数据吗？',
@@ -392,11 +517,20 @@
         type: 'warning',
       },
     ).then(() => {
+      if (type == '1') {
       // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+        list.value = list.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+      // 删除行
+        filesList.value = filesList.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
     })
   }
   else {
@@ -433,7 +567,12 @@
         基本信息
       </h4>
       <div>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item)"
+        >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -462,11 +601,21 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
+              <el-select
+                v-model.trim="fromListInfo.id"
+                clearable
                 placeholder="标准名称"
+                size="default"
                 :disabled="buttonType === '查看'"
-              />
+                @change="standardChange"
+              >
+                <el-option
+                  v-for="item in standardList"
+                  :key="item.id"
+                  :label="item.standardName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -474,7 +623,7 @@
               <el-input
                 v-model.trim="formInline.projectNo"
                 placeholder="项目编号"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -483,7 +632,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -494,7 +643,7 @@
               <el-input
                 v-model.trim="formInline.organizeNo"
                 placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -506,7 +655,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -517,7 +666,7 @@
                 clearable
                 placeholder="标准负责人"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardOwnerOptions"
@@ -533,7 +682,7 @@
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -546,7 +695,7 @@
                 clearable
                 placeholder="类别"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -564,7 +713,7 @@
                 clearable
                 placeholder="标准等级"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardLevelList"
@@ -582,7 +731,7 @@
                 clearable
                 placeholder="传递范围"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in transmitRangeList"
@@ -598,7 +747,7 @@
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 placeholder="投资总额"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -612,7 +761,7 @@
                 placeholder="请选择筹建日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -623,7 +772,7 @@
                 clearable
                 placeholder="标准所在实验室"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
                 @clear="clearDeptList"
               >
                 <el-option
@@ -641,7 +790,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -650,7 +799,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -663,7 +812,7 @@
                 clearable
                 placeholder="管理状态"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardManagerStateList"
@@ -681,7 +830,7 @@
                 clearable
                 placeholder="计量专业"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in measureMajorList"
@@ -697,7 +846,7 @@
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -709,7 +858,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -721,7 +870,7 @@
                 v-model.trim="formInline.uncertainty"
                 style="width: 500px;"
                 placeholder="不确定度"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -733,7 +882,7 @@
                 v-model.trim="formInline.mesureRange"
                 placeholder="测量范围"
                 style="width: 500px;"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -747,7 +896,7 @@
               <el-input
                 v-model.trim="formInline.standardTemperature"
                 placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -756,7 +905,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -807,7 +956,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
               <el-upload
@@ -826,7 +975,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -834,7 +983,7 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -848,36 +997,123 @@
           <el-button v-if="buttonType !== '查看'" type="primary">
             批量选择
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="primary"
+            @click="addRoow"
+          >
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('1')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="buttonType === '查看'"
+                  @click="chooseList(scope.row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="header">
         <div class="title">
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('2')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
+      <el-table
+        :data="filesList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                    上传
+                  </el-button>
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="buttonType === '查看'" class="header">
         <div class="title">
           审批流程
         </div>
@@ -885,94 +1121,78 @@
     </div>
   </app-container>
   <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
       <el-button type="info" @click="applyListClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
+  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
 <style lang="scss" scoped>
@@ -997,6 +1217,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-top: 2vh;
   padding: 5px;
   width: 100%;
   height: 6vh;
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
new file mode 100644
index 0000000..bbaaa1f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -0,0 +1,151 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  name: '', // 姓名
+})
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'xinghao',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'fanwei',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'bumen',
+    align: 'center',
+  },
+  {
+    text: '检定时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定结果',
+    value: 'jieguo',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'riqi',
+    align: 'center',
+  },
+])
+const list = ref([{ name: '张三' }])
+// 搜索
+const search = () => {
+  list.value = props.list.filter(item => item.name === listQuery.value.name)
+}
+const changePage = (e: any) => {
+  console.log(e)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '', // 姓名
+  }
+  list.value = props.list
+}
+// 点击保存
+const submitForm = () => {
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 监听数据变化
+watch(
+  [() => props.list], ([newNums], [oldNums]) => {
+    list.value = newNums
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index a26eb9d..d7a0f7f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -19,7 +19,7 @@
   deptId: string
 }
 
-export interface IlistTypes {
+export interface IlistQuery {
   applyNo: string
   applyStatus: string
   applyType: string
@@ -29,4 +29,19 @@
   organizeNo: string
   standardName: string
   standardNo: string
+  limit: number
+  offset: number
+}
+
+export interface IlistTypes {
+  applyNo: string
+  applyTypeName: string
+  standardNo: string
+  standardName: string
+  constructionStandardUnitName: string
+  standardOwner: string
+  applyDept: string
+  createUser: string
+  createTime: string
+  approvalStatusName: string
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index a776302..540b91c 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -28,7 +28,6 @@
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
-  historicalPriceList: [],
   id: null,
   isDel: 0,
   model: '',
@@ -121,6 +120,7 @@
       type: 'warning',
     },
       ).then(() => {
+      // 新增提交
         if (type === '提交' && pageType.value !== 'edit') {
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
@@ -130,6 +130,7 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
+        // 编辑提交
         else if (type === '提交' && pageType.value === 'edit') {
           formInline.value.id = infoId.value
           buttonLoading.value = true

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index eb506ec..6b440d0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,15 +2,17 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
+import UserListDialog from './userListDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const props = defineProps({
   infoId: {
-    type: String,
-    default: '0',
+    type: String || Number,
+    default: '',
   },
   buttonType: {
     type: String,
@@ -66,6 +68,53 @@
   updateTime: null,
   version: null,
 })
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyEquipmentList: [
+    {
+      createTime: '',
+      createUser: 0,
+      equipmentId: 0,
+      id: 0,
+      isDel: 0,
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  applyNo: '',
+  applyType: '',
+  applyTypeName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: '',
+  createUser: '',
+  fileList: [
+    {
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  id: '',
+  isDel: 0,
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: '',
+  version: '',
+})
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -132,7 +181,6 @@
 }
 // 数据
 const list = ref<object[]>([
-  { name: '王五' },
 ])
 // 标准配套设备更换表格总数
 const total = ref(0)
@@ -157,48 +205,68 @@
   text: string
   value: string
   align: string
+  required: Boolean
+  choose: Boolean
 }
+// 申请文档列表
+const filesList = ref([])
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
   {
     text: '设备编号',
     value: 'bianhao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '型号',
     value: 'xinghao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '测量范围',
     value: 'fanwei',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '使用部门',
     value: 'bumen',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定时间',
     value: 'time',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定结果',
     value: 'jieguo',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '有效日期',
     value: 'riqi',
     align: 'center',
+    required: true,
+    choose: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -209,26 +277,34 @@
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
 // 申请文档表头
-const columnsFiles = ref<object[]>([
+const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '上传时间',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '文件说明',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '附件文档',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
 ])
 // 标准配套设备更换表格分页
@@ -238,6 +314,8 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框
+const standardList = ref([])
 // 关闭
 const close = () => {
   emit('close')
@@ -265,6 +343,24 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
+// 获取数据
+const fetchData = () => {
+  const params = {
+    standardNo: '',
+    standardName: '',
+    category: '',
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 1000000,
+  }
+  getStandardList(params).then((response) => {
+    standardList.value = response.data.rows
+  })
+}
+fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
   const fd = new FormData()
@@ -290,6 +386,22 @@
 
   )
 }
+// 选择标准配套设备
+const userListDialog = ref()
+
+// 点击标准配套设备选择按钮
+const chooseList = (row: object) => {
+  console.log(row)
+  userListDialog.value.initDialog()
+}
+// 选择完成之后的回调
+const confirmPerson = (e: any) => {
+  console.log(e)
+}
+// 增加申请文档列表
+const addRow = () => {
+  filesList.value.push({})
+}
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -328,8 +440,8 @@
   formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+const getInfo = (id: string | number) => {
+  getStandardListDetail({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -339,7 +451,7 @@
   })
 }
 if (props.buttonType !== '') {
-  getInfo()
+  getInfo(props.infoId)
 }
 
 // 提交
@@ -351,7 +463,9 @@
 // 点击顶部一排按钮
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
-    console.log(item)
+    getStandardLisAdd(fromListInfo.value).then((res) => {
+      console.log(res)
+    })
   }
   else {
     if (item === '同意') {
@@ -366,10 +480,21 @@
     applyShow.value = true
   }
 }
+// 选择了标准名称后
+const standardChange = (e: any) => {
+  getInfo(e)
+  formInline.value.standardOwner = e
+}
 // 点击增加行
 const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
+  // const params = {
+  //   equipmentName: '',
+  //   equipmentNo: '',
+  //   equipmentType: '',
+  //   depreciationMethod: '',
+
+  // }
+  list.value.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -381,7 +506,7 @@
   handleClose()
 }
 // 标准配套设备更换表格删除行
-const removeRow = () => {
+const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
     ElMessageBox.confirm(
       '确认删除选中的数据吗？',
@@ -392,11 +517,20 @@
         type: 'warning',
       },
     ).then(() => {
+      if (type == '1') {
       // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+        list.value = list.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+      // 删除行
+        filesList.value = filesList.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
     })
   }
   else {
@@ -433,7 +567,12 @@
         基本信息
       </h4>
       <div>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item)"
+        >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -462,11 +601,21 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
+              <el-select
+                v-model.trim="fromListInfo.id"
+                clearable
                 placeholder="标准名称"
+                size="default"
                 :disabled="buttonType === '查看'"
-              />
+                @change="standardChange"
+              >
+                <el-option
+                  v-for="item in standardList"
+                  :key="item.id"
+                  :label="item.standardName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -474,7 +623,7 @@
               <el-input
                 v-model.trim="formInline.projectNo"
                 placeholder="项目编号"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -483,7 +632,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -494,7 +643,7 @@
               <el-input
                 v-model.trim="formInline.organizeNo"
                 placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -506,7 +655,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -517,7 +666,7 @@
                 clearable
                 placeholder="标准负责人"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardOwnerOptions"
@@ -533,7 +682,7 @@
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -546,7 +695,7 @@
                 clearable
                 placeholder="类别"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -564,7 +713,7 @@
                 clearable
                 placeholder="标准等级"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardLevelList"
@@ -582,7 +731,7 @@
                 clearable
                 placeholder="传递范围"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in transmitRangeList"
@@ -598,7 +747,7 @@
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 placeholder="投资总额"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -612,7 +761,7 @@
                 placeholder="请选择筹建日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -623,7 +772,7 @@
                 clearable
                 placeholder="标准所在实验室"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
                 @clear="clearDeptList"
               >
                 <el-option
@@ -641,7 +790,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -650,7 +799,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -663,7 +812,7 @@
                 clearable
                 placeholder="管理状态"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardManagerStateList"
@@ -681,7 +830,7 @@
                 clearable
                 placeholder="计量专业"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in measureMajorList"
@@ -697,7 +846,7 @@
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -709,7 +858,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -721,7 +870,7 @@
                 v-model.trim="formInline.uncertainty"
                 style="width: 500px;"
                 placeholder="不确定度"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -733,7 +882,7 @@
                 v-model.trim="formInline.mesureRange"
                 placeholder="测量范围"
                 style="width: 500px;"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -747,7 +896,7 @@
               <el-input
                 v-model.trim="formInline.standardTemperature"
                 placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -756,7 +905,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -807,7 +956,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
               <el-upload
@@ -826,7 +975,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -834,7 +983,7 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -848,36 +997,123 @@
           <el-button v-if="buttonType !== '查看'" type="primary">
             批量选择
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="primary"
+            @click="addRoow"
+          >
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('1')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="buttonType === '查看'"
+                  @click="chooseList(scope.row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="header">
         <div class="title">
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('2')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
+      <el-table
+        :data="filesList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                    上传
+                  </el-button>
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="buttonType === '查看'" class="header">
         <div class="title">
           审批流程
         </div>
@@ -885,94 +1121,78 @@
     </div>
   </app-container>
   <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
       <el-button type="info" @click="applyListClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
+  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
 <style lang="scss" scoped>
@@ -997,6 +1217,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-top: 2vh;
   padding: 5px;
   width: 100%;
   height: 6vh;
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
new file mode 100644
index 0000000..bbaaa1f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -0,0 +1,151 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  name: '', // 姓名
+})
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'xinghao',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'fanwei',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'bumen',
+    align: 'center',
+  },
+  {
+    text: '检定时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定结果',
+    value: 'jieguo',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'riqi',
+    align: 'center',
+  },
+])
+const list = ref([{ name: '张三' }])
+// 搜索
+const search = () => {
+  list.value = props.list.filter(item => item.name === listQuery.value.name)
+}
+const changePage = (e: any) => {
+  console.log(e)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '', // 姓名
+  }
+  list.value = props.list
+}
+// 点击保存
+const submitForm = () => {
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 监听数据变化
+watch(
+  [() => props.list], ([newNums], [oldNums]) => {
+    list.value = newNums
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index a26eb9d..d7a0f7f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -19,7 +19,7 @@
   deptId: string
 }
 
-export interface IlistTypes {
+export interface IlistQuery {
   applyNo: string
   applyStatus: string
   applyType: string
@@ -29,4 +29,19 @@
   organizeNo: string
   standardName: string
   standardNo: string
+  limit: number
+  offset: number
+}
+
+export interface IlistTypes {
+  applyNo: string
+  applyTypeName: string
+  standardNo: string
+  standardName: string
+  constructionStandardUnitName: string
+  standardOwner: string
+  applyDept: string
+  createUser: string
+  createTime: string
+  approvalStatusName: string
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index a776302..540b91c 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -28,7 +28,6 @@
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
-  historicalPriceList: [],
   id: null,
   isDel: 0,
   model: '',
@@ -121,6 +120,7 @@
       type: 'warning',
     },
       ).then(() => {
+      // 新增提交
         if (type === '提交' && pageType.value !== 'edit') {
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
@@ -130,6 +130,7 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
+        // 编辑提交
         else if (type === '提交' && pageType.value === 'edit') {
           formInline.value.id = infoId.value
           buttonLoading.value = true
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 55e33e2..4382302 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -102,7 +102,7 @@
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
+        :list-loading="loadingTable" :pagination="false"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index fd3d518..ffd9e95 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -58,9 +58,26 @@
 // 获取申请列表
 export function getstandardEquipmentApplyList(data: object) {
   return request({
-    url: '/standard/standardEquipmentApplyList',
+    url: `/standard/standardEquipmentApplyList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
 }
 
+// 删除申请列表信息
+export function getStandardLisdelete(data: object) {
+  return request({
+    url: `${prefix}/standard/deleteStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建申请列表信息
+export function getStandardLisAdd(data: object) {
+  return request({
+    url: `${prefix}/standard/addStandardEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 82157b8..8000909 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,10 +2,9 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistTypes } from '../../standard_interface'
+import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-import { getstandardEquipmentApplyList } from '@/api/device/standard'
+import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -28,7 +27,7 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
+const listQuery: Ref<IlistQuery> = ref({
   applyNo: '',
   applyStatus: '',
   applyType: props.applyType,
@@ -38,13 +37,13 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
+  limit: 10,
+  offset: 1,
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref([
-  { name: '张飒' },
-])
+const list = ref([])
 // 总数
 const total = ref(0)
 // 表头
@@ -117,6 +116,8 @@
   approvalTime: '',
 })
 const buttonArray = ref<string[]>([])
+// 部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -129,13 +130,21 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
-const standardManagerStateList = ref([
-  { name: '张三', id: '1', value: '1' },
-  { name: '李四', id: '2', value: '5' },
-  { name: '王五', id: '3', value: '7' },
-  { name: '赵六', id: '4', value: '2' },
-])
 const loadingTable = ref(false)
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -156,14 +165,14 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   id: string
-  name: string
+  standardName: string
   standardOwner: string
   createTime: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn, type: string) => {
   ElMessageBox.confirm(
-    `确认${type}${row.name}吗？`,
+    `确认${type}${row.standardName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +181,17 @@
     },
   )
     .then(() => {
-      // getSoucreListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      if (type === '删除') {
+        getStandardLisdelete({ id: row.id as string }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: '删除成功',
+            })
+            fetchData(true)
+          }
+        })
+      }
     })
 }
 // 点击编辑/详情
@@ -216,6 +227,7 @@
 }
 // 点击搜索
 const searchList = () => {
+  fetchData(true)
 }
 const cancelEvent = () => {
   console.log('cancel!')
@@ -223,11 +235,17 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
+    applyNo: '',
+    applyStatus: '',
+    applyType: props.applyType,
+    approvalStatus: props.approvalStatus,
+    createUser: '',
+    equipmentNo: '',
+    organizeNo: '',
+    standardName: '',
+    standardNo: '',
+    limit: 10,
     offset: 1,
-    limit: 20,
   }
 }
 // 关闭编辑
@@ -243,17 +261,17 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
+      name: '标准装置申请',
+      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
       sheetName: 'sheet1',
     })
   }
@@ -371,28 +389,13 @@
             size="default"
           >
             <el-option
-              v-for="item in standardManagerStateList"
+              v-for="item in standardUsersDeptList"
               :key="item.id"
-              :label="item.name"
-              :value="item.value"
+              :label="item.organizeName"
+              :value="item.id"
             />
           </el-select>
         </search-item>
-        <!-- <search-item >
-          <el-select
-            v-model.trim="listQuery.applyStatus"
-            clearable
-            placeholder="申请状态"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardManagerStateList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item> -->
       </search-area>
       <table-container>
         <template #btns-right>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index eb506ec..6b440d0 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,15 +2,17 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
+import UserListDialog from './userListDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const props = defineProps({
   infoId: {
-    type: String,
-    default: '0',
+    type: String || Number,
+    default: '',
   },
   buttonType: {
     type: String,
@@ -66,6 +68,53 @@
   updateTime: null,
   version: null,
 })
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyEquipmentList: [
+    {
+      createTime: '',
+      createUser: 0,
+      equipmentId: 0,
+      id: 0,
+      isDel: 0,
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  applyNo: '',
+  applyType: '',
+  applyTypeName: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: '',
+  createUser: '',
+  fileList: [
+    {
+      createTime: '',
+      createUser: 0,
+      fileName: '',
+      id: 0,
+      isDel: 0,
+      minioFileName: '',
+      remark: '',
+      standardApplyId: 0,
+      updateTime: '',
+    },
+  ],
+  id: '',
+  isDel: 0,
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: '',
+  version: '',
+})
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -132,7 +181,6 @@
 }
 // 数据
 const list = ref<object[]>([
-  { name: '王五' },
 ])
 // 标准配套设备更换表格总数
 const total = ref(0)
@@ -157,48 +205,68 @@
   text: string
   value: string
   align: string
+  required: Boolean
+  choose: Boolean
 }
+// 申请文档列表
+const filesList = ref([])
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
   {
     text: '设备编号',
     value: 'bianhao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '型号',
     value: 'xinghao',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '测量范围',
     value: 'fanwei',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '使用部门',
     value: 'bumen',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定时间',
     value: 'time',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '检定结果',
     value: 'jieguo',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '有效日期',
     value: 'riqi',
     align: 'center',
+    required: true,
+    choose: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -209,26 +277,34 @@
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
 // 申请文档表头
-const columnsFiles = ref<object[]>([
+const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '上传时间',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '文件说明',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: false,
   },
   {
     text: '附件文档',
     value: 'name',
     align: 'center',
+    required: true,
+    choose: true,
   },
 ])
 // 标准配套设备更换表格分页
@@ -238,6 +314,8 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框
+const standardList = ref([])
 // 关闭
 const close = () => {
   emit('close')
@@ -265,6 +343,24 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
+// 获取数据
+const fetchData = () => {
+  const params = {
+    standardNo: '',
+    standardName: '',
+    category: '',
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 1000000,
+  }
+  getStandardList(params).then((response) => {
+    standardList.value = response.data.rows
+  })
+}
+fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
   const fd = new FormData()
@@ -290,6 +386,22 @@
 
   )
 }
+// 选择标准配套设备
+const userListDialog = ref()
+
+// 点击标准配套设备选择按钮
+const chooseList = (row: object) => {
+  console.log(row)
+  userListDialog.value.initDialog()
+}
+// 选择完成之后的回调
+const confirmPerson = (e: any) => {
+  console.log(e)
+}
+// 增加申请文档列表
+const addRow = () => {
+  filesList.value.push({})
+}
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
@@ -328,8 +440,8 @@
   formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
-const getInfo = () => {
-  getStandardListDetail({ id: props.infoId }).then((res) => {
+const getInfo = (id: string | number) => {
+  getStandardListDetail({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
       if (typeof (res.data[item]) === 'number') {
         res.data[item] = res.data[item].toString()
@@ -339,7 +451,7 @@
   })
 }
 if (props.buttonType !== '') {
-  getInfo()
+  getInfo(props.infoId)
 }
 
 // 提交
@@ -351,7 +463,9 @@
 // 点击顶部一排按钮
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
-    console.log(item)
+    getStandardLisAdd(fromListInfo.value).then((res) => {
+      console.log(res)
+    })
   }
   else {
     if (item === '同意') {
@@ -366,10 +480,21 @@
     applyShow.value = true
   }
 }
+// 选择了标准名称后
+const standardChange = (e: any) => {
+  getInfo(e)
+  formInline.value.standardOwner = e
+}
 // 点击增加行
 const addRoow = () => {
-  Object.keys(addList.value).forEach(key => (addList.value[key] = ''))
-  dialogVisible.value = true
+  // const params = {
+  //   equipmentName: '',
+  //   equipmentNo: '',
+  //   equipmentType: '',
+  //   depreciationMethod: '',
+
+  // }
+  list.value.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -381,7 +506,7 @@
   handleClose()
 }
 // 标准配套设备更换表格删除行
-const removeRow = () => {
+const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
     ElMessageBox.confirm(
       '确认删除选中的数据吗？',
@@ -392,11 +517,20 @@
         type: 'warning',
       },
     ).then(() => {
+      if (type == '1') {
       // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+        list.value = list.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+      // 删除行
+        filesList.value = filesList.value.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
     })
   }
   else {
@@ -433,7 +567,12 @@
         基本信息
       </h4>
       <div>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item)">
+        <el-button
+          v-for="(item, index) in buttonArray"
+          :key="index"
+          type="primary"
+          @click="getAddList(item)"
+        >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -462,11 +601,21 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
-              <el-input
-                v-model.trim="formInline.standardName"
+              <el-select
+                v-model.trim="fromListInfo.id"
+                clearable
                 placeholder="标准名称"
+                size="default"
                 :disabled="buttonType === '查看'"
-              />
+                @change="standardChange"
+              >
+                <el-option
+                  v-for="item in standardList"
+                  :key="item.id"
+                  :label="item.standardName"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -474,7 +623,7 @@
               <el-input
                 v-model.trim="formInline.projectNo"
                 placeholder="项目编号"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -483,7 +632,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
                 placeholder="建标项目"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -494,7 +643,7 @@
               <el-input
                 v-model.trim="formInline.organizeNo"
                 placeholder="组织机构代码"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -506,7 +655,7 @@
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -517,7 +666,7 @@
                 clearable
                 placeholder="标准负责人"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardOwnerOptions"
@@ -533,7 +682,7 @@
               <el-input
                 v-model.trim="formInline.contactInfo"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -546,7 +695,7 @@
                 clearable
                 placeholder="类别"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in checkTypeOptions"
@@ -564,7 +713,7 @@
                 clearable
                 placeholder="标准等级"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardLevelList"
@@ -582,7 +731,7 @@
                 clearable
                 placeholder="传递范围"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in transmitRangeList"
@@ -598,7 +747,7 @@
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 placeholder="投资总额"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -612,7 +761,7 @@
                 placeholder="请选择筹建日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -623,7 +772,7 @@
                 clearable
                 placeholder="标准所在实验室"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
                 @clear="clearDeptList"
               >
                 <el-option
@@ -641,7 +790,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -650,7 +799,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
                 placeholder="联系方式"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -663,7 +812,7 @@
                 clearable
                 placeholder="管理状态"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in standardManagerStateList"
@@ -681,7 +830,7 @@
                 clearable
                 placeholder="计量专业"
                 size="default"
-                :disabled="buttonType === '查看'"
+                disabled
               >
                 <el-option
                   v-for="item in measureMajorList"
@@ -697,7 +846,7 @@
               <el-input
                 v-model.trim="formInline.assessmentUnit"
                 placeholder="考核单位"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -709,7 +858,7 @@
                 placeholder="请选择考核日期"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -721,7 +870,7 @@
                 v-model.trim="formInline.uncertainty"
                 style="width: 500px;"
                 placeholder="不确定度"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -733,7 +882,7 @@
                 v-model.trim="formInline.mesureRange"
                 placeholder="测量范围"
                 style="width: 500px;"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -747,7 +896,7 @@
               <el-input
                 v-model.trim="formInline.standardTemperature"
                 placeholder="标准温度℃"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -756,7 +905,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 placeholder="标准湿度%"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -807,7 +956,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
               <el-upload
@@ -826,7 +975,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -834,7 +983,7 @@
                 v-model.trim="formInline.remark"
                 style="width: 500px;"
                 placeholder="备注"
-                :disabled="buttonType === '查看'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -848,36 +997,123 @@
           <el-button v-if="buttonType !== '查看'" type="primary">
             批量选择
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRoow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="primary"
+            @click="addRoow"
+          >
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('1')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
+      <el-table
+        :data="list"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="buttonType === '查看'"
+                  @click="chooseList(scope.row)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="header">
         <div class="title">
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
             增加行
           </el-button>
-          <el-button v-if="buttonType !== '查看'" type="info" @click="removeRow">
+          <el-button
+            v-if="buttonType !== '查看'"
+            type="info"
+            @click="removeRow('2')"
+          >
             删除行
           </el-button>
         </span>
       </div>
-      <normal-table
-        :data="list" :total="total" :columns="columnsFiles" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-      />
-      <div class="header">
+      <el-table
+        :data="filesList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                    上传
+                  </el-button>
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="buttonType === '查看'" class="header">
         <div class="title">
           审批流程
         </div>
@@ -885,94 +1121,78 @@
     </div>
   </app-container>
   <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addList"
-      style="max-width: 460px;"
-    >
-      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addList[column.value]">
-        <el-input v-model="addList[column.value]" />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <el-dialog
     v-model="applyShow"
     title="审批操作"
-    width="30%"
+    width="50%"
     :before-close="applyListClose"
-    close-on-press-escape
-    draggable
-    :close-on-click-modal="false"
   >
     <el-form
       ref="addPersonListForm"
       label-position="left"
       label-width="100px"
-      inline
       :model="applyList"
-      style="max-width: 460px;"
     >
-      <el-form-item label="审批意见:">
-        <el-radio-group v-model="applyList.select" class="ml-4">
-          <el-radio label="1" size="large">
-            同意
-          </el-radio>
-          <el-radio label="2" size="large">
-            驳回
-          </el-radio>
-          <el-radio label="3" size="large">
-            拒绝
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论:">
-        <el-input
-          v-model="applyList.epilog"
-          maxlength="200"
-          placeholder="审批结论"
-          style="width: 20vw;"
-          show-word-limit
-          type="textarea"
-        />
-      </el-form-item>
-      <el-form-item label="审批人:">
-        <el-input
-          v-model="applyList.approval"
-          border="none"
-          placeholder="审批人"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
-      <el-form-item label="审批时间:">
-        <el-input
-          v-model="applyList.approvalTime"
-          placeholder="审批时间"
-          style="width: 5vw;"
-          disabled
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="applyList.select" class="ml-4">
+              <el-radio label="1" size="large">
+                同意
+              </el-radio>
+              <el-radio label="2" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="3" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:">
+            <el-input
+              v-model="applyList.epilog"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="applyList.approval"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="applyList.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <div class="dialog-buts">
+    <template #footer>
       <el-button type="primary" @click="applyListSubmit">
         提交
       </el-button>
       <el-button type="info" @click="applyListClose">
         取消
       </el-button>
-    </div>
+    </template>
   </el-dialog>
+  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
 </template>
 
 <style lang="scss" scoped>
@@ -997,6 +1217,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-top: 2vh;
   padding: 5px;
   width: 100%;
   height: 6vh;
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
new file mode 100644
index 0000000..bbaaa1f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -0,0 +1,151 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  name: '', // 姓名
+})
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'bianhao',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'xinghao',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'fanwei',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'bumen',
+    align: 'center',
+  },
+  {
+    text: '检定时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定结果',
+    value: 'jieguo',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'riqi',
+    align: 'center',
+  },
+])
+const list = ref([{ name: '张三' }])
+// 搜索
+const search = () => {
+  list.value = props.list.filter(item => item.name === listQuery.value.name)
+}
+const changePage = (e: any) => {
+  console.log(e)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    name: '', // 姓名
+  }
+  list.value = props.list
+}
+// 点击保存
+const submitForm = () => {
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
+}
+// 监听数据变化
+watch(
+  [() => props.list], ([newNums], [oldNums]) => {
+    list.value = newNums
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index a26eb9d..d7a0f7f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -19,7 +19,7 @@
   deptId: string
 }
 
-export interface IlistTypes {
+export interface IlistQuery {
   applyNo: string
   applyStatus: string
   applyType: string
@@ -29,4 +29,19 @@
   organizeNo: string
   standardName: string
   standardNo: string
+  limit: number
+  offset: number
+}
+
+export interface IlistTypes {
+  applyNo: string
+  applyTypeName: string
+  standardNo: string
+  standardName: string
+  constructionStandardUnitName: string
+  standardOwner: string
+  applyDept: string
+  createUser: string
+  createTime: string
+  approvalStatusName: string
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index a776302..540b91c 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -28,7 +28,6 @@
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
-  historicalPriceList: [],
   id: null,
   isDel: 0,
   model: '',
@@ -121,6 +120,7 @@
       type: 'warning',
     },
       ).then(() => {
+      // 新增提交
         if (type === '提交' && pageType.value !== 'edit') {
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
@@ -130,6 +130,7 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
+        // 编辑提交
         else if (type === '提交' && pageType.value === 'edit') {
           formInline.value.id = infoId.value
           buttonLoading.value = true
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 55e33e2..4382302 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -102,7 +102,7 @@
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
+        :list-loading="loadingTable" :pagination="false"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 523b03e..ce76ace 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -408,10 +408,10 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
+        <el-button v-if="pageType !== 'detail'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" :disabled="pageType === 'detail'" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRoow">
           增加行
         </el-button>
       </template>