diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c99ad13..2070654 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -31,6 +31,10 @@
     type: String,
     default: '',
   },
+  limit: {
+    type: Number,
+    default: 5,
+  },
 })
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -50,7 +54,7 @@
   certificateValidEnd: '',
   directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
-  limit: 5,
+  limit: $props.limit,
   offset: 1,
   companyId: '',
 })
@@ -212,7 +216,7 @@
     directorName: '',
     companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
-    limit: 5,
+    limit: $props.limit,
     offset: 1,
   }
   search()

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c99ad13..2070654 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -31,6 +31,10 @@
     type: String,
     default: '',
   },
+  limit: {
+    type: Number,
+    default: 5,
+  },
 })
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -50,7 +54,7 @@
   certificateValidEnd: '',
   directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
-  limit: 5,
+  limit: $props.limit,
   offset: 1,
   companyId: '',
 })
@@ -212,7 +216,7 @@
     directorName: '',
     companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
-    limit: 5,
+    limit: $props.limit,
     offset: 1,
   }
   search()
diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue
new file mode 100644
index 0000000..5fdcfea
--- /dev/null
+++ b/src/views/tested/status/delay/components/delay.vue
@@ -0,0 +1,483 @@
+<!-- 延用列表 -->
+<script lang="ts" setup name="DeviceStatusList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelStatus, deleteStatus, detailStatus, editStatus, getListPage, submitStatus } from '@/api/eqpt/status/index'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelByname, getModelList } from '@/api/eqpt/device/model'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { toTreeList, underlineToHump } from '@/utils/structure'
+import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { getPostList } from '@/api/system/post'
+const $props = defineProps({
+  //  审批状态  全部 审批等
+  statusName: {
+    type: String,
+    default: '',
+  },
+  // 设备状态  封存 启封等
+  statusType: {
+    type: String,
+    default: '',
+  },
+})
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const statusDict = ref<{ [key: string]: string }>({
+  1: 'sealpage', // 封存
+  2: 'unsealpage', // 启封
+  3: 'disablepage', // 禁用
+  4: 'scrappage', // 报废
+  5: 'sdelaypage', // 延用
+})
+const formIdDict = ref<{ [key: string]: string }>({
+  1: SCHEDULE.EQUIPMENT_SEALED_APPROVAL,
+  2: SCHEDULE.EQUIPMENT_UNSEALED_APPROVAL,
+  3: SCHEDULE.EQUIPMENT_DISABLE_APPROVAL,
+  4: SCHEDULE.EQUIPMENT_SCRAP_APPROVAL,
+  5: SCHEDULE.EQUIPMENT_DELAY_APPROVAL,
+})
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  approvalNo: '',
+  approvalStatus: '',
+  approvalReason: '',
+  // usePositionId: '',
+  createUserName: '',
+  createTimeStart: '',
+  createTimeEnd: '',
+  deptId: '',
+  companyId: '',
+  approvalType: $props.statusType,
+  // equipmentName: '',
+  // model: '',
+  // equipmentNo: '',
+  formId: formIdDict.value[Number($props.statusType)],
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'approvalNo',
+    align: 'center',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '延用设备数量',
+    value: 'equipmentCount',
+    align: 'center',
+  },
+  {
+    text: '延用原因',
+    value: 'approvalReason',
+    align: 'center',
+  },
+  {
+    text: '延用至',
+    value: 'approvalTime',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 申请开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 重置
+const reset = () => {
+  datetimerange.value = ''
+  listQuery.approvalNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createUserName = ''
+  listQuery.createTimeStart = ''
+  // listQuery.usePositionId = ''
+  // listQuery.equipmentName = ''
+  listQuery.approvalReason = ''
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  // listQuery.model = ''
+  // listQuery.equipmentNo = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `${statusDict.value[$props.statusType]}/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      statusType: $props.statusType,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: `${statusDict.value[$props.statusType]}/${'detail'}`,
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+        statusType: $props.statusType,
+      },
+    })
+  }
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteStatus(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelStatus({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitStatus({ id: row.id, formId: formIdDict.value[Number($props.statusType)] }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+const permUrl = ref({
+  add: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/add`,
+  edit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/edit`,
+  del: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/delete`,
+  submit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/submit`,
+  cancel: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/cancel`,
+  agree: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/agree`,
+  reject: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/reject`,
+})
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const modelListAll = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+const fetchDict = () => {
+  // 设备名称
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({ equipmentType: '1' }).then((res) => {
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    modelListAll.value = res.data
+  })
+  // companyId
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
+// watch(() => listQuery.equipmentName, (newVal) => {
+//   listQuery.model = ''
+//   if (newVal) {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.equipmentName === newVal && item.model).map((item: any) => item.model))).sort()
+//   }
+//   else {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+//   }
+// })
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.deptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalReason" placeholder="延用原因" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-select v-model="listQuery.usePositionId" filterable clearable placeholder="使用岗位">
+          <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </search-item> -->
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="listLoading" :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
+

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c99ad13..2070654 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -31,6 +31,10 @@
     type: String,
     default: '',
   },
+  limit: {
+    type: Number,
+    default: 5,
+  },
 })
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -50,7 +54,7 @@
   certificateValidEnd: '',
   directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
-  limit: 5,
+  limit: $props.limit,
   offset: 1,
   companyId: '',
 })
@@ -212,7 +216,7 @@
     directorName: '',
     companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
-    limit: 5,
+    limit: $props.limit,
     offset: 1,
   }
   search()
diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue
new file mode 100644
index 0000000..5fdcfea
--- /dev/null
+++ b/src/views/tested/status/delay/components/delay.vue
@@ -0,0 +1,483 @@
+<!-- 延用列表 -->
+<script lang="ts" setup name="DeviceStatusList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelStatus, deleteStatus, detailStatus, editStatus, getListPage, submitStatus } from '@/api/eqpt/status/index'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelByname, getModelList } from '@/api/eqpt/device/model'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { toTreeList, underlineToHump } from '@/utils/structure'
+import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { getPostList } from '@/api/system/post'
+const $props = defineProps({
+  //  审批状态  全部 审批等
+  statusName: {
+    type: String,
+    default: '',
+  },
+  // 设备状态  封存 启封等
+  statusType: {
+    type: String,
+    default: '',
+  },
+})
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const statusDict = ref<{ [key: string]: string }>({
+  1: 'sealpage', // 封存
+  2: 'unsealpage', // 启封
+  3: 'disablepage', // 禁用
+  4: 'scrappage', // 报废
+  5: 'sdelaypage', // 延用
+})
+const formIdDict = ref<{ [key: string]: string }>({
+  1: SCHEDULE.EQUIPMENT_SEALED_APPROVAL,
+  2: SCHEDULE.EQUIPMENT_UNSEALED_APPROVAL,
+  3: SCHEDULE.EQUIPMENT_DISABLE_APPROVAL,
+  4: SCHEDULE.EQUIPMENT_SCRAP_APPROVAL,
+  5: SCHEDULE.EQUIPMENT_DELAY_APPROVAL,
+})
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  approvalNo: '',
+  approvalStatus: '',
+  approvalReason: '',
+  // usePositionId: '',
+  createUserName: '',
+  createTimeStart: '',
+  createTimeEnd: '',
+  deptId: '',
+  companyId: '',
+  approvalType: $props.statusType,
+  // equipmentName: '',
+  // model: '',
+  // equipmentNo: '',
+  formId: formIdDict.value[Number($props.statusType)],
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'approvalNo',
+    align: 'center',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '延用设备数量',
+    value: 'equipmentCount',
+    align: 'center',
+  },
+  {
+    text: '延用原因',
+    value: 'approvalReason',
+    align: 'center',
+  },
+  {
+    text: '延用至',
+    value: 'approvalTime',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 申请开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 重置
+const reset = () => {
+  datetimerange.value = ''
+  listQuery.approvalNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createUserName = ''
+  listQuery.createTimeStart = ''
+  // listQuery.usePositionId = ''
+  // listQuery.equipmentName = ''
+  listQuery.approvalReason = ''
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  // listQuery.model = ''
+  // listQuery.equipmentNo = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `${statusDict.value[$props.statusType]}/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      statusType: $props.statusType,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: `${statusDict.value[$props.statusType]}/${'detail'}`,
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+        statusType: $props.statusType,
+      },
+    })
+  }
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteStatus(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelStatus({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitStatus({ id: row.id, formId: formIdDict.value[Number($props.statusType)] }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+const permUrl = ref({
+  add: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/add`,
+  edit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/edit`,
+  del: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/delete`,
+  submit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/submit`,
+  cancel: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/cancel`,
+  agree: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/agree`,
+  reject: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/reject`,
+})
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const modelListAll = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+const fetchDict = () => {
+  // 设备名称
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({ equipmentType: '1' }).then((res) => {
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    modelListAll.value = res.data
+  })
+  // companyId
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
+// watch(() => listQuery.equipmentName, (newVal) => {
+//   listQuery.model = ''
+//   if (newVal) {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.equipmentName === newVal && item.model).map((item: any) => item.model))).sort()
+//   }
+//   else {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+//   }
+// })
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.deptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalReason" placeholder="延用原因" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-select v-model="listQuery.usePositionId" filterable clearable placeholder="使用岗位">
+          <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </search-item> -->
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="listLoading" :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
+
diff --git a/src/views/tested/status/delay/components/deviceList.vue b/src/views/tested/status/delay/components/deviceList.vue
new file mode 100644
index 0000000..8a14181
--- /dev/null
+++ b/src/views/tested/status/delay/components/deviceList.vue
@@ -0,0 +1,136 @@
+<!-- 主附件信息表格 -->
+<script lang="ts" setup name="AnnextTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+import selectDeviceMultiple from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '规格型号',
+    value: 'model',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+  },
+  {
+    text: '检定单位',
+    value: 'checkOrganization',
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备列表')
+}
+
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+const deviceRef = ref()
+// 添加行
+const addRow = () => {
+  deviceRef.value.initDialog(true)
+}
+const confirm = (data: any) => {
+  data.forEach((item: any) => {
+    // console.log(item)
+    if (list.value.every((citem: any) => citem.id !== item.id)) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备列表">
+    <select-device-multiple ref="deviceRef" :need-status="true" @add="confirm" />
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" 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 && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c99ad13..2070654 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -31,6 +31,10 @@
     type: String,
     default: '',
   },
+  limit: {
+    type: Number,
+    default: 5,
+  },
 })
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -50,7 +54,7 @@
   certificateValidEnd: '',
   directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
-  limit: 5,
+  limit: $props.limit,
   offset: 1,
   companyId: '',
 })
@@ -212,7 +216,7 @@
     directorName: '',
     companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
-    limit: 5,
+    limit: $props.limit,
     offset: 1,
   }
   search()
diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue
new file mode 100644
index 0000000..5fdcfea
--- /dev/null
+++ b/src/views/tested/status/delay/components/delay.vue
@@ -0,0 +1,483 @@
+<!-- 延用列表 -->
+<script lang="ts" setup name="DeviceStatusList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelStatus, deleteStatus, detailStatus, editStatus, getListPage, submitStatus } from '@/api/eqpt/status/index'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelByname, getModelList } from '@/api/eqpt/device/model'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { toTreeList, underlineToHump } from '@/utils/structure'
+import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { getPostList } from '@/api/system/post'
+const $props = defineProps({
+  //  审批状态  全部 审批等
+  statusName: {
+    type: String,
+    default: '',
+  },
+  // 设备状态  封存 启封等
+  statusType: {
+    type: String,
+    default: '',
+  },
+})
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const statusDict = ref<{ [key: string]: string }>({
+  1: 'sealpage', // 封存
+  2: 'unsealpage', // 启封
+  3: 'disablepage', // 禁用
+  4: 'scrappage', // 报废
+  5: 'sdelaypage', // 延用
+})
+const formIdDict = ref<{ [key: string]: string }>({
+  1: SCHEDULE.EQUIPMENT_SEALED_APPROVAL,
+  2: SCHEDULE.EQUIPMENT_UNSEALED_APPROVAL,
+  3: SCHEDULE.EQUIPMENT_DISABLE_APPROVAL,
+  4: SCHEDULE.EQUIPMENT_SCRAP_APPROVAL,
+  5: SCHEDULE.EQUIPMENT_DELAY_APPROVAL,
+})
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  approvalNo: '',
+  approvalStatus: '',
+  approvalReason: '',
+  // usePositionId: '',
+  createUserName: '',
+  createTimeStart: '',
+  createTimeEnd: '',
+  deptId: '',
+  companyId: '',
+  approvalType: $props.statusType,
+  // equipmentName: '',
+  // model: '',
+  // equipmentNo: '',
+  formId: formIdDict.value[Number($props.statusType)],
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'approvalNo',
+    align: 'center',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '延用设备数量',
+    value: 'equipmentCount',
+    align: 'center',
+  },
+  {
+    text: '延用原因',
+    value: 'approvalReason',
+    align: 'center',
+  },
+  {
+    text: '延用至',
+    value: 'approvalTime',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 申请开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 重置
+const reset = () => {
+  datetimerange.value = ''
+  listQuery.approvalNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createUserName = ''
+  listQuery.createTimeStart = ''
+  // listQuery.usePositionId = ''
+  // listQuery.equipmentName = ''
+  listQuery.approvalReason = ''
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  // listQuery.model = ''
+  // listQuery.equipmentNo = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `${statusDict.value[$props.statusType]}/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      statusType: $props.statusType,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: `${statusDict.value[$props.statusType]}/${'detail'}`,
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+        statusType: $props.statusType,
+      },
+    })
+  }
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteStatus(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelStatus({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitStatus({ id: row.id, formId: formIdDict.value[Number($props.statusType)] }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+const permUrl = ref({
+  add: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/add`,
+  edit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/edit`,
+  del: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/delete`,
+  submit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/submit`,
+  cancel: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/cancel`,
+  agree: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/agree`,
+  reject: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/reject`,
+})
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const modelListAll = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+const fetchDict = () => {
+  // 设备名称
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({ equipmentType: '1' }).then((res) => {
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    modelListAll.value = res.data
+  })
+  // companyId
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
+// watch(() => listQuery.equipmentName, (newVal) => {
+//   listQuery.model = ''
+//   if (newVal) {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.equipmentName === newVal && item.model).map((item: any) => item.model))).sort()
+//   }
+//   else {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+//   }
+// })
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.deptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalReason" placeholder="延用原因" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-select v-model="listQuery.usePositionId" filterable clearable placeholder="使用岗位">
+          <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </search-item> -->
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="listLoading" :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
+
diff --git a/src/views/tested/status/delay/components/deviceList.vue b/src/views/tested/status/delay/components/deviceList.vue
new file mode 100644
index 0000000..8a14181
--- /dev/null
+++ b/src/views/tested/status/delay/components/deviceList.vue
@@ -0,0 +1,136 @@
+<!-- 主附件信息表格 -->
+<script lang="ts" setup name="AnnextTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+import selectDeviceMultiple from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '规格型号',
+    value: 'model',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+  },
+  {
+    text: '检定单位',
+    value: 'checkOrganization',
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备列表')
+}
+
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+const deviceRef = ref()
+// 添加行
+const addRow = () => {
+  deviceRef.value.initDialog(true)
+}
+const confirm = (data: any) => {
+  data.forEach((item: any) => {
+    // console.log(item)
+    if (list.value.every((citem: any) => citem.id !== item.id)) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备列表">
+    <select-device-multiple ref="deviceRef" :need-status="true" @add="confirm" />
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" 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 && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index b30564c..22e59aa 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
+import deviceList from './deviceList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
@@ -58,6 +59,8 @@
   approvalTime: '',
   approvalType: '',
   attachments: [],
+  equipmentInfos: [],
+  equipmentIds: [],
   companyId: 0,
   companyName: '',
   createTime: '',
@@ -81,6 +84,9 @@
   manufactureNo: '',
   manufacturer: '',
   productCountry: '',
+  usePosition: '',
+  deptName: '',
+  remark: '',
 })
 // 表单1验证规则
 const rules = ref<FormRules>({
@@ -120,6 +126,11 @@
       ruleForm.value.manufacturer = data.manufacturer
       ruleForm.value.manufactureNo = data.manufactureNo
       ruleForm.value.productDate = data.productDate
+      ruleForm.value.manufactureNo = data.manufactureNo
+      ruleForm.value.companyName = data.companyName
+      ruleForm.value.deptName = data.deptName
+      ruleForm.value.usePosition = data.usePosition
+      ruleForm.value.remark = res.data.remark
     })
   }
 }
@@ -131,45 +142,56 @@
   $router.back()
 }
 const annexRef = ref()
+const devicelistRef = ref()
 const disabledSave = ref(false)
 // 保存
 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => {
-  if (!formEl || !formEl1) { return }
-  Promise.all([formEl.validate(), formEl1.validate()]).then(() => {
+  if ($route.query.statusType !== '5') {
+    if (!formEl || !formEl1) { return }
+  }
+  else {
+    if (!formEl1) { return }
+  }
+  ($route.query.statusType !== '5' ? Promise.all([formEl?.validate(), formEl1.validate()]) : Promise.all([formEl1.validate()])).then(() => {
     // 验证表格
-    if (annexRef.value.checkCertificateList()) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        disabledSave.value = true
-        if (submitId.value) {
-          ruleForm.value.id = submitId.value
-        }
-        ruleForm.value.attachments = annexRef.value.list
+    // if (annexRef.value.checkCertificateList()) {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((res) => {
+      disabledSave.value = true
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      if ($route.query.statusType !== '5') {
+        ruleForm.value.attachments = annexRef.value?.list || []
         ruleForm.value.equipmentInfo = undefined
-        editStatus(ruleForm.value).then((res) => {
-          disabledSave.value = false
-          submitId.value = res.data
-          if (statusName === '已取消' || statusName === '未通过') {
-            submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => {
-              ElMessage.success('已提交')
-              close()
-            })
-          }
-          else {
-            ElMessage.success('保存成功')
-          }
-        }).catch(() => {
-          disabledSave.value = false
-        })
+      }
+      else {
+        ruleForm.value.equipmentIds = devicelistRef.value.list.map((item: any) => item.id)
+      }
+      editStatus(ruleForm.value).then((res) => {
+        disabledSave.value = false
+        submitId.value = res.data
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      }).catch(() => {
+        disabledSave.value = false
       })
-    }
+    })
+    // }
   })
 }
 // 提交
@@ -266,6 +288,10 @@
   ruleForm.value.manufactureNo = data.manufactureNo
   ruleForm.value.productDate = data.productDate
   ruleForm.value.productDate = data.productDate
+  ruleForm.value.manufactureNo = data.manufactureNo
+  ruleForm.value.deptName = data.deptName
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.usePosition = data.usePosition
   // 获取设备 技术指标信息
   getInfoDetail({ equipmentId: row.id }).then((res) => {
     ruleForm.value.attachments = res.data.attachments
@@ -277,7 +303,7 @@
 <template>
   <app-container style="overflow: hidden;">
     <!-- 选择设备弹窗 -->
-    <select-device ref="deviceRef" :status-type="$route.query.statusType as string" :need-status="true" @add="confirm" />
+    <select-device ref="deviceRef" :status-type="$route.query.statusType as string" :limit="10" :need-status="true" @add="confirm" />
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`${statusTypeDict[$route.query.statusType as string]}申请-${textMap[dialogStatus]}`">
@@ -316,11 +342,11 @@
               <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="登记表名称">
               <el-input v-model.trim="ruleForm.approvalName" disabled />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="申请人">
               <el-input v-model.trim="ruleForm.createUserName" disabled />
@@ -334,7 +360,7 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="$route.query.statusType !== '5'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
@@ -351,54 +377,74 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" disabled />
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="$route.path.includes('create') ? '设备名称' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="所在单位" prop="companyName">
-              <el-input v-model.trim="ruleForm.companyName" placeholder="所在单位" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="生产国家" prop="productCountry">
-              <el-input v-model.trim="ruleForm.productCountry" placeholder="生产国家" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产厂家" prop="manufacturer">
-              <el-input v-model.trim="ruleForm.manufacturer" placeholder="生产厂家" disabled />
+              <el-input v-model.trim="ruleForm.model" :placeholder="$route.path.includes('create') ? '规格型号' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="出厂编号" prop="manufactureNo">
-              <el-input v-model.trim="ruleForm.manufactureNo" placeholder="出厂编号" disabled />
+              <el-input v-model.trim="ruleForm.manufactureNo" :placeholder="$route.path.includes('create') ? '出厂编号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="所在单位" prop="companyName">
+              <el-input v-model.trim="ruleForm.companyName" placeholder="所在单位" disabled />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <!-- <el-col :span="6">
+            <el-form-item label="生产国家" prop="productCountry">
+              <el-input v-model.trim="ruleForm.productCountry" placeholder="生产国家" disabled />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="$route.path.includes('create') ? '生产厂家' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="所在单位">
+              <el-input v-model.trim="ruleForm.companyName" :placeholder="$route.path.includes('create') ? '所在单位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门">
+              <el-input v-model.trim="ruleForm.deptName" :placeholder="$route.path.includes('create') ? '使用部门' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位">
+              <el-input v-model.trim="ruleForm.usePosition" :placeholder="$route.path.includes('create') ? '使用岗位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model.trim="ruleForm.manufactureNo" placeholder="出厂编号" disabled />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="6">
             <el-form-item label="生产日期" prop="productDate">
               <el-date-picker
                 v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;" disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="ruleForm.attachments.length && $route.query.statusType !== '5'">
       <annex-list ref="annexRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="$route.query.statusType !== '5'">
       <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
         <el-row v-if="$route.query.statusType !== '4' && $route.query.statusType !== '5' && $route.query.statusType !== '2'" :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item label="设备性能状态" prop="performStatus">
               <el-input v-model.trim="ruleForm.performStatus" placeholder="设备性能状态" />
             </el-form-item>
@@ -412,21 +458,19 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}原因`" prop="approvalReason">
-              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="`${statusTypeDict[$route.query.statusType as string]}原因`" />
+              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="`${statusTypeDict[$route.query.statusType as string]}原因`" type="textarea" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="$route.query.statusType !== '2' && $route.query.statusType !== '5'" :gutter="24" class="marg">
-          <el-col :span="8">
+        <el-row :gutter="24" class="marg">
+          <el-col v-if="$route.query.statusType !== '2' && $route.query.statusType !== '5'" :span="12">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}地点`" prop="approvalAddress">
               <el-input v-model.trim="ruleForm.approvalAddress" :placeholder="`${statusTypeDict[$route.query.statusType as string]}地点`" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="$route.query.statusType !== '2'" :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col v-if="$route.query.statusType !== '2'" :span="12">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}时间`" prop="approvalTime">
               <!-- <el-input v-model.trim="ruleForm.approvalTime" /> -->
               <el-date-picker
@@ -436,8 +480,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.remark" :placeholder="$route.path.includes('create') ? '备注' : ''" type="textarea" :rows="2" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 延用申请 -->
+    <detail-block-com v-if="$route.query.statusType === '5'">
+      <el-form
+        ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="延用原因" prop="approvalReason">
+              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="$route.path.includes('create') ? '延用原因' : ''" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="延用至" prop="approvalTime">
+              <el-date-picker
+                v-model="ruleForm.approvalTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" :placeholder="`${statusTypeDict[$route.query.statusType as string]}时间`" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <!-- 延用设备列表 -->
+    <detail-block-com v-if="$route.query.statusType === '5'">
+      <device-list ref="devicelistRef" :data="ruleForm.equipmentInfos" :status="$route.params.type as string" />
+    </detail-block-com>
     <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" />
   </app-container>
 </template>

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c99ad13..2070654 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -31,6 +31,10 @@
     type: String,
     default: '',
   },
+  limit: {
+    type: Number,
+    default: 5,
+  },
 })
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -50,7 +54,7 @@
   certificateValidEnd: '',
   directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
-  limit: 5,
+  limit: $props.limit,
   offset: 1,
   companyId: '',
 })
@@ -212,7 +216,7 @@
     directorName: '',
     companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
-    limit: 5,
+    limit: $props.limit,
     offset: 1,
   }
   search()
diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue
new file mode 100644
index 0000000..5fdcfea
--- /dev/null
+++ b/src/views/tested/status/delay/components/delay.vue
@@ -0,0 +1,483 @@
+<!-- 延用列表 -->
+<script lang="ts" setup name="DeviceStatusList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelStatus, deleteStatus, detailStatus, editStatus, getListPage, submitStatus } from '@/api/eqpt/status/index'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelByname, getModelList } from '@/api/eqpt/device/model'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { toTreeList, underlineToHump } from '@/utils/structure'
+import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { getPostList } from '@/api/system/post'
+const $props = defineProps({
+  //  审批状态  全部 审批等
+  statusName: {
+    type: String,
+    default: '',
+  },
+  // 设备状态  封存 启封等
+  statusType: {
+    type: String,
+    default: '',
+  },
+})
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const statusDict = ref<{ [key: string]: string }>({
+  1: 'sealpage', // 封存
+  2: 'unsealpage', // 启封
+  3: 'disablepage', // 禁用
+  4: 'scrappage', // 报废
+  5: 'sdelaypage', // 延用
+})
+const formIdDict = ref<{ [key: string]: string }>({
+  1: SCHEDULE.EQUIPMENT_SEALED_APPROVAL,
+  2: SCHEDULE.EQUIPMENT_UNSEALED_APPROVAL,
+  3: SCHEDULE.EQUIPMENT_DISABLE_APPROVAL,
+  4: SCHEDULE.EQUIPMENT_SCRAP_APPROVAL,
+  5: SCHEDULE.EQUIPMENT_DELAY_APPROVAL,
+})
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  approvalNo: '',
+  approvalStatus: '',
+  approvalReason: '',
+  // usePositionId: '',
+  createUserName: '',
+  createTimeStart: '',
+  createTimeEnd: '',
+  deptId: '',
+  companyId: '',
+  approvalType: $props.statusType,
+  // equipmentName: '',
+  // model: '',
+  // equipmentNo: '',
+  formId: formIdDict.value[Number($props.statusType)],
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'approvalNo',
+    align: 'center',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '延用设备数量',
+    value: 'equipmentCount',
+    align: 'center',
+  },
+  {
+    text: '延用原因',
+    value: 'approvalReason',
+    align: 'center',
+  },
+  {
+    text: '延用至',
+    value: 'approvalTime',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 申请开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 重置
+const reset = () => {
+  datetimerange.value = ''
+  listQuery.approvalNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createUserName = ''
+  listQuery.createTimeStart = ''
+  // listQuery.usePositionId = ''
+  // listQuery.equipmentName = ''
+  listQuery.approvalReason = ''
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  // listQuery.model = ''
+  // listQuery.equipmentNo = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `${statusDict.value[$props.statusType]}/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      statusType: $props.statusType,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: `${statusDict.value[$props.statusType]}/${'detail'}`,
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+        statusType: $props.statusType,
+      },
+    })
+  }
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteStatus(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelStatus({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitStatus({ id: row.id, formId: formIdDict.value[Number($props.statusType)] }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+const permUrl = ref({
+  add: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/add`,
+  edit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/edit`,
+  del: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/delete`,
+  submit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/submit`,
+  cancel: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/cancel`,
+  agree: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/agree`,
+  reject: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/reject`,
+})
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const modelListAll = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+const fetchDict = () => {
+  // 设备名称
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({ equipmentType: '1' }).then((res) => {
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    modelListAll.value = res.data
+  })
+  // companyId
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
+// watch(() => listQuery.equipmentName, (newVal) => {
+//   listQuery.model = ''
+//   if (newVal) {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.equipmentName === newVal && item.model).map((item: any) => item.model))).sort()
+//   }
+//   else {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+//   }
+// })
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.deptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalReason" placeholder="延用原因" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-select v-model="listQuery.usePositionId" filterable clearable placeholder="使用岗位">
+          <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </search-item> -->
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="listLoading" :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
+
diff --git a/src/views/tested/status/delay/components/deviceList.vue b/src/views/tested/status/delay/components/deviceList.vue
new file mode 100644
index 0000000..8a14181
--- /dev/null
+++ b/src/views/tested/status/delay/components/deviceList.vue
@@ -0,0 +1,136 @@
+<!-- 主附件信息表格 -->
+<script lang="ts" setup name="AnnextTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+import selectDeviceMultiple from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '规格型号',
+    value: 'model',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+  },
+  {
+    text: '检定单位',
+    value: 'checkOrganization',
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备列表')
+}
+
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+const deviceRef = ref()
+// 添加行
+const addRow = () => {
+  deviceRef.value.initDialog(true)
+}
+const confirm = (data: any) => {
+  data.forEach((item: any) => {
+    // console.log(item)
+    if (list.value.every((citem: any) => citem.id !== item.id)) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备列表">
+    <select-device-multiple ref="deviceRef" :need-status="true" @add="confirm" />
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" 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 && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index b30564c..22e59aa 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
+import deviceList from './deviceList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
@@ -58,6 +59,8 @@
   approvalTime: '',
   approvalType: '',
   attachments: [],
+  equipmentInfos: [],
+  equipmentIds: [],
   companyId: 0,
   companyName: '',
   createTime: '',
@@ -81,6 +84,9 @@
   manufactureNo: '',
   manufacturer: '',
   productCountry: '',
+  usePosition: '',
+  deptName: '',
+  remark: '',
 })
 // 表单1验证规则
 const rules = ref<FormRules>({
@@ -120,6 +126,11 @@
       ruleForm.value.manufacturer = data.manufacturer
       ruleForm.value.manufactureNo = data.manufactureNo
       ruleForm.value.productDate = data.productDate
+      ruleForm.value.manufactureNo = data.manufactureNo
+      ruleForm.value.companyName = data.companyName
+      ruleForm.value.deptName = data.deptName
+      ruleForm.value.usePosition = data.usePosition
+      ruleForm.value.remark = res.data.remark
     })
   }
 }
@@ -131,45 +142,56 @@
   $router.back()
 }
 const annexRef = ref()
+const devicelistRef = ref()
 const disabledSave = ref(false)
 // 保存
 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => {
-  if (!formEl || !formEl1) { return }
-  Promise.all([formEl.validate(), formEl1.validate()]).then(() => {
+  if ($route.query.statusType !== '5') {
+    if (!formEl || !formEl1) { return }
+  }
+  else {
+    if (!formEl1) { return }
+  }
+  ($route.query.statusType !== '5' ? Promise.all([formEl?.validate(), formEl1.validate()]) : Promise.all([formEl1.validate()])).then(() => {
     // 验证表格
-    if (annexRef.value.checkCertificateList()) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        disabledSave.value = true
-        if (submitId.value) {
-          ruleForm.value.id = submitId.value
-        }
-        ruleForm.value.attachments = annexRef.value.list
+    // if (annexRef.value.checkCertificateList()) {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((res) => {
+      disabledSave.value = true
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      if ($route.query.statusType !== '5') {
+        ruleForm.value.attachments = annexRef.value?.list || []
         ruleForm.value.equipmentInfo = undefined
-        editStatus(ruleForm.value).then((res) => {
-          disabledSave.value = false
-          submitId.value = res.data
-          if (statusName === '已取消' || statusName === '未通过') {
-            submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => {
-              ElMessage.success('已提交')
-              close()
-            })
-          }
-          else {
-            ElMessage.success('保存成功')
-          }
-        }).catch(() => {
-          disabledSave.value = false
-        })
+      }
+      else {
+        ruleForm.value.equipmentIds = devicelistRef.value.list.map((item: any) => item.id)
+      }
+      editStatus(ruleForm.value).then((res) => {
+        disabledSave.value = false
+        submitId.value = res.data
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      }).catch(() => {
+        disabledSave.value = false
       })
-    }
+    })
+    // }
   })
 }
 // 提交
@@ -266,6 +288,10 @@
   ruleForm.value.manufactureNo = data.manufactureNo
   ruleForm.value.productDate = data.productDate
   ruleForm.value.productDate = data.productDate
+  ruleForm.value.manufactureNo = data.manufactureNo
+  ruleForm.value.deptName = data.deptName
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.usePosition = data.usePosition
   // 获取设备 技术指标信息
   getInfoDetail({ equipmentId: row.id }).then((res) => {
     ruleForm.value.attachments = res.data.attachments
@@ -277,7 +303,7 @@
 <template>
   <app-container style="overflow: hidden;">
     <!-- 选择设备弹窗 -->
-    <select-device ref="deviceRef" :status-type="$route.query.statusType as string" :need-status="true" @add="confirm" />
+    <select-device ref="deviceRef" :status-type="$route.query.statusType as string" :limit="10" :need-status="true" @add="confirm" />
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`${statusTypeDict[$route.query.statusType as string]}申请-${textMap[dialogStatus]}`">
@@ -316,11 +342,11 @@
               <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="登记表名称">
               <el-input v-model.trim="ruleForm.approvalName" disabled />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="申请人">
               <el-input v-model.trim="ruleForm.createUserName" disabled />
@@ -334,7 +360,7 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="$route.query.statusType !== '5'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
@@ -351,54 +377,74 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" disabled />
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="$route.path.includes('create') ? '设备名称' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="所在单位" prop="companyName">
-              <el-input v-model.trim="ruleForm.companyName" placeholder="所在单位" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="生产国家" prop="productCountry">
-              <el-input v-model.trim="ruleForm.productCountry" placeholder="生产国家" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产厂家" prop="manufacturer">
-              <el-input v-model.trim="ruleForm.manufacturer" placeholder="生产厂家" disabled />
+              <el-input v-model.trim="ruleForm.model" :placeholder="$route.path.includes('create') ? '规格型号' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="出厂编号" prop="manufactureNo">
-              <el-input v-model.trim="ruleForm.manufactureNo" placeholder="出厂编号" disabled />
+              <el-input v-model.trim="ruleForm.manufactureNo" :placeholder="$route.path.includes('create') ? '出厂编号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="所在单位" prop="companyName">
+              <el-input v-model.trim="ruleForm.companyName" placeholder="所在单位" disabled />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <!-- <el-col :span="6">
+            <el-form-item label="生产国家" prop="productCountry">
+              <el-input v-model.trim="ruleForm.productCountry" placeholder="生产国家" disabled />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="$route.path.includes('create') ? '生产厂家' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="所在单位">
+              <el-input v-model.trim="ruleForm.companyName" :placeholder="$route.path.includes('create') ? '所在单位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门">
+              <el-input v-model.trim="ruleForm.deptName" :placeholder="$route.path.includes('create') ? '使用部门' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位">
+              <el-input v-model.trim="ruleForm.usePosition" :placeholder="$route.path.includes('create') ? '使用岗位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model.trim="ruleForm.manufactureNo" placeholder="出厂编号" disabled />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="6">
             <el-form-item label="生产日期" prop="productDate">
               <el-date-picker
                 v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;" disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="ruleForm.attachments.length && $route.query.statusType !== '5'">
       <annex-list ref="annexRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="$route.query.statusType !== '5'">
       <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
         <el-row v-if="$route.query.statusType !== '4' && $route.query.statusType !== '5' && $route.query.statusType !== '2'" :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item label="设备性能状态" prop="performStatus">
               <el-input v-model.trim="ruleForm.performStatus" placeholder="设备性能状态" />
             </el-form-item>
@@ -412,21 +458,19 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}原因`" prop="approvalReason">
-              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="`${statusTypeDict[$route.query.statusType as string]}原因`" />
+              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="`${statusTypeDict[$route.query.statusType as string]}原因`" type="textarea" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="$route.query.statusType !== '2' && $route.query.statusType !== '5'" :gutter="24" class="marg">
-          <el-col :span="8">
+        <el-row :gutter="24" class="marg">
+          <el-col v-if="$route.query.statusType !== '2' && $route.query.statusType !== '5'" :span="12">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}地点`" prop="approvalAddress">
               <el-input v-model.trim="ruleForm.approvalAddress" :placeholder="`${statusTypeDict[$route.query.statusType as string]}地点`" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="$route.query.statusType !== '2'" :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col v-if="$route.query.statusType !== '2'" :span="12">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}时间`" prop="approvalTime">
               <!-- <el-input v-model.trim="ruleForm.approvalTime" /> -->
               <el-date-picker
@@ -436,8 +480,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.remark" :placeholder="$route.path.includes('create') ? '备注' : ''" type="textarea" :rows="2" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 延用申请 -->
+    <detail-block-com v-if="$route.query.statusType === '5'">
+      <el-form
+        ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="延用原因" prop="approvalReason">
+              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="$route.path.includes('create') ? '延用原因' : ''" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="延用至" prop="approvalTime">
+              <el-date-picker
+                v-model="ruleForm.approvalTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" :placeholder="`${statusTypeDict[$route.query.statusType as string]}时间`" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <!-- 延用设备列表 -->
+    <detail-block-com v-if="$route.query.statusType === '5'">
+      <device-list ref="devicelistRef" :data="ruleForm.equipmentInfos" :status="$route.params.type as string" />
+    </detail-block-com>
     <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 5d4bd3d..090ba91 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -113,7 +113,7 @@
   },
   {
     text: '使用岗位',
-    value: 'deptName',
+    value: 'usePositionName',
     align: 'center',
   },
   {
@@ -166,6 +166,7 @@
 })
 // 重置
 const reset = () => {
+  datetimerange.value = ''
   listQuery.manufactureNo = ''
   listQuery.createTimeEnd = ''
   listQuery.createTimeStart = ''

diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 1a0b5ff..e0c7153 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -19,3 +19,10 @@
     data,
   })
 }
+export function addSatifaction(data: object) {
+  return request({
+    url: '/resource/customer/questionnaire/add',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 3969740..6b482d3 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -3,9 +3,14 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+// import { create } from 'qrcode'
 import questionnaireTable from './questionnaire.vue'
+import FilterCustomerStaff from './filterCustomerStaff.vue'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
-import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { addSatifaction, updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
+import { getUserDept } from '@/api/system/user'
+// import useUserStore from '@/store/modules/user'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -47,7 +52,9 @@
   writerName: '',
 }) // 表单
 const rules = ref<FormRules>({
-  // fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
+  writerName: [{ required: true, message: '填写人必填', trigger: ['blur', 'change'] }],
+  writeTime: [{ required: true, message: '填写时间必选', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -57,6 +64,16 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
+  else {
+    // 获取当前用户单位
+    getUserDept().then((res) => {
+      // ruleForm.value.customerName = res.data.fullName
+      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.senderName = userStore.name
+      ruleForm.value.senderId = userStore.id
+      ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    })
+  }
 }
 onMounted(() => {
   initDialog()
@@ -77,18 +94,41 @@
     close()
   })
 }
+// 新建
+const create = () => {
+  const list = tableRef.value.rateList
+  list.forEach((item: any) => {
+    ruleForm.value[item.attributeName] = item.value.toString()
+  })
+  addSatifaction(ruleForm.value).then((res) => {
+    ElMessage.success('保存成功')
+    close()
+  })
+}
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
-  ElMessageBox.confirm(
-    '确认保存吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    update()
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        if ($route.path.includes('create')) {
+          // 新建
+          create()
+        }
+        else {
+          // 编辑
+          update()
+        }
+      })
+    }
   })
 }
 // 取消
@@ -96,10 +136,33 @@
   formEl?.resetFields()
   close()
 }
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+// 选择填写人
+const refFilterCustomer = ref()
+const selectPerson = () => {
+  if (!$route.path.includes('create')) {
+    return
+  }
+  // 显示筛选填写用户和单位的弹窗
+  refFilterCustomer.value.showOrHideFilterDialog(true)
+}
+const confirmPerson = (row: any) => {
+  refFilterCustomer.value.showOrHideFilterDialog(false)
+  // console.log(row, 'row')
+  ruleForm.value.customerName = row.deptName
+  ruleForm.value.customerId = row.deptId
+  ruleForm.value.writerName = row.name
+  ruleForm.value.writerId = row.id
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 用户弹窗 -->
+    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -115,12 +178,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="表单编号" prop="questionnaireNo">
-              <el-input v-model.trim="ruleForm.questionnaireNo" placeholder="表单编号" disabled />
+              <el-input v-model.trim="ruleForm.questionnaireNo" :placeholder="$route.path.includes('create') ? '系统自动生成' : '表单编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写单位" prop="customerName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="填写单位" disabled />
+              <el-input v-model.trim="ruleForm.customerName" placeholder="选择填写人时自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -137,12 +200,36 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled />
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
+                <template #append>
+                  <el-button type="primary" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="填写时间" prop="writeTime">
-              <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" disabled />
+              <!-- <el-input v-model.trim="ruleForm.writeTime" placeholder="填写时间" :disabled="$route.path.includes('detail')" /> -->
+              <el-date-picker
+                v-model="ruleForm.writeTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="填写时间" class="normal-date" style="width: 100%;"
+                :disabled="$route.path.includes('detail')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="$route.path.includes('create')" :span="6">
+            <el-form-item label="实验室代码" prop="labCode">
+              <!-- <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')" /> -->
+              <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                <el-option
+                  v-for="item in labCodeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
new file mode 100644
index 0000000..af3ba93
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/filterCustomerStaff.vue
@@ -0,0 +1,243 @@
+<!-- 筛选系统用户弹窗 -->
+<script name="FilterCustomerStaff" lang="ts" setup>
+import { getUserList } from '@/api/system/user'
+// import { getCustomerInfoList } from '@/api/resource/customer'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { toTreeList } from '@/utils/structure'
+
+defineProps({
+  title: {
+    type: String,
+    default: '请选择',
+  },
+})
+
+const emit = defineEmits(['recordSelected'])
+
+const treeProps = {
+  children: 'children',
+  label: 'name',
+}
+
+// 定义变量
+const customerIdSelected = ref<string>('')
+const customerNameSelected = ref<string>('')
+
+const showFilterDialog = ref(false)
+const customerQuery = ref<any>({
+  customerName: '',
+  approvalStatus: '0', // 查询委托方名录
+  formId: 'zyglwtfml', // 表单Id
+  offset: 1,
+  limit: 1000,
+})
+const sysUserQuery = ref<any>({
+  keywords: '',
+  deptId: '',
+  offset: 1,
+  limit: 10,
+  sort: '',
+  beginTime: '',
+  endTime: '',
+  deptType: '',
+})
+const sysUserList = ref([])
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '账号', value: 'account', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center' },
+  { text: '部门', value: 'deptName', align: 'center' },
+]) // 表头
+
+const customerTree = ref<Array<any>>([])
+
+// 查询用户列表
+const getSysUserList = () => {
+  getUserList(sysUserQuery.value).then((res) => {
+    if (res.code === 200) {
+      sysUserList.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          customerId: customerIdSelected.value,
+          customerName: customerNameSelected.value,
+        }
+      })
+      total.value = Number(res.data.total)
+    }
+  })
+}
+getSysUserList()
+// 查询委托方名录列表
+const allTree = ref()
+const getCustomerList = () => {
+  getDeptTreeList({}).then((res) => {
+    if (res.code === 200) {
+      // customerTree.value = res.data.rows
+      allTree.value = res.data.map((item: any) => ({ ...item, customerName: item.name }))
+      customerTree.value = toTreeList<any>(res.data.map((item: any) => ({ ...item, customerName: item.name })), '0', true)
+      // console.log(customerTree.value, 'customerTree.value')
+    }
+    else {
+      customerTree.value = []
+    }
+  })
+}
+// 过滤委托方名录列表
+const filterCustomerList = (val: string) => {
+  if (val) {
+    customerTree.value = toTreeList(allTree.value.filter((item: any) => item.customerName.includes(val)), '0')
+  }
+  else {
+    customerTree.value = toTreeList(allTree.value, '0', true)
+  }
+}
+// 逻辑
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    sysUserQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    sysUserQuery.value.offset = val.page
+  }
+  getSysUserList()
+}
+
+// 点击树形结构
+const handleNodeClick = (data: any) => {
+  sysUserQuery.value.deptId = data.id
+
+  // 赋值选中的委托方
+  customerIdSelected.value = data.id
+  customerNameSelected.value = data.customerName
+
+  getSysUserList()
+}
+
+// 选中用户
+const selectSingleUser = (row: Object) => {
+  emit('recordSelected', row)
+}
+
+const showOrHideFilterDialog = (show: boolean) => {
+  if (show === false) {
+    customerQuery.value.customerName = ''
+    customerQuery.value.approvalStatus = '0'
+
+    sysUserQuery.value.keywords = ''
+    sysUserQuery.value.offset = 1
+    sysUserQuery.value.limit = 10
+  }
+  else {
+    getCustomerList()
+  }
+
+  showFilterDialog.value = show
+}
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" :title="title" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <div class="container">
+      <!-- 左侧组织机构 -->
+      <div class="left-container">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <search-item>
+              <el-input v-model="customerQuery.customerName" placeholder="委托方名称" clearable @change="filterCustomerList" />
+            </search-item>
+
+            <el-scrollbar height="100%" class="user-dept-scroll">
+              <el-tree
+                ref="refCustomerTree"
+                :data="customerTree" :props="treeProps" node-key="id"
+                default-expand-all :highlight-current="true"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </div>
+
+      <!-- 右侧表格 -->
+      <div ref="tableContainer" class="table">
+        <search-area :need-clear="false" @search="getSysUserList">
+          <search-item>
+            <el-input v-model="sysUserQuery.keywords" placeholder="姓名" clearable />
+          </search-item>
+        </search-area>
+
+        <!-- 表格数据展示 -->
+        <table-container :title-show="false">
+          <!-- 表格区域 -->
+          <normal-table
+            id="sysUserFilter"
+            :data="sysUserList" :total="total" :columns="columns"
+            :query="{ limit: sysUserQuery.limit, offset: sysUserQuery.offset }"
+            @change="changePage"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (sysUserQuery.offset - 1) * sysUserQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column fixed="right" label="操作" align="center" width="130">
+                <template #default="{ row }">
+                  <el-button size="small" type="primary" @click="selectSingleUser(row)">
+                    选定
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </table-container>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.container {
+  width: 100%;
+  display: flex;
+
+  .left-container {
+    width: 30%;
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .table {
+    width: 70%;
+  }
+}
+
+.dept-div {
+  padding-right: 12px;
+
+  :deep(.el-card) {
+    // height: 100vh;
+    background-color: #fff;
+  }
+
+  .box-card {
+    width: 100%;
+
+    .user-dept-scroll {
+      width: 100%;
+      // height: calc(100vh - 120px);
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 23e45b8..5466a07 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -121,6 +121,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/satisfaction/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b06d2d6..861e656 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -66,7 +66,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -79,7 +79,7 @@
   {
     text: '特殊要求',
     value: 'specialRequire',
-    required: true,
+    required: false,
     type: 'input',
   },
   // {
@@ -178,14 +178,14 @@
     list.value.push({
       sampleManufacturer: '',
       appearanceInspect: '',
-      appendixDescn: '',
+      appendixDescn: '无',
       measureContent: '',
       sampleModel: '',
       sampleId: '',
       sampleNo: '',
       sampleName: '',
       sampleManufactureNo: '',
-      specialRequire: '',
+      specialRequire: '无',
       editable: true,
     })
   }
@@ -237,7 +237,7 @@
       if (!list.value.filter((c: any) => c.sampleId === item.id).length) {
         list.value.push({
           appearanceInspect: '',
-          appendixDescn: '',
+          appendixDescn: '无',
           measureContent: '',
           sampleManufacturer: item.manufacturer,
           sampleModel: item.model,
@@ -245,7 +245,7 @@
           sampleId: item.id,
           sampleName: item.equipmentName,
           sampleManufactureNo: item.manufactureNo,
-          specialRequire: '',
+          specialRequire: '无',
           editable: true,
         })
       }
@@ -257,13 +257,13 @@
       const row = {
         sampleManufacturer: device.manufacturer,
         appearanceInspect: '',
-        appendixDescn: '',
+        appendixDescn: '无',
         measureContent: '',
         sampleModel: device.model,
         sampleId: device.id,
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
-        specialRequire: '',
+        specialRequire: '无',
         sampleManufactureNo: device.manufactureNo,
         editable: true,
       }
diff --git a/src/views/tested/device/certificate/components/edit.vue b/src/views/tested/device/certificate/components/edit.vue
index de32a93..b6b386d 100644
--- a/src/views/tested/device/certificate/components/edit.vue
+++ b/src/views/tested/device/certificate/components/edit.vue
@@ -61,9 +61,9 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`证书管理-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <!-- <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
-        </el-button>
+        </el-button> -->
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 2dd8151..ee51d09 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -25,7 +25,6 @@
   limit: 20,
   // sort: 'desc',
   // orderBy: 'create_time',
-
 })
 const columns = ref([
   {
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c99ad13..2070654 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -31,6 +31,10 @@
     type: String,
     default: '',
   },
+  limit: {
+    type: Number,
+    default: 5,
+  },
 })
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -50,7 +54,7 @@
   certificateValidEnd: '',
   directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
-  limit: 5,
+  limit: $props.limit,
   offset: 1,
   companyId: '',
 })
@@ -212,7 +216,7 @@
     directorName: '',
     companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
-    limit: 5,
+    limit: $props.limit,
     offset: 1,
   }
   search()
diff --git a/src/views/tested/status/delay/components/delay.vue b/src/views/tested/status/delay/components/delay.vue
new file mode 100644
index 0000000..5fdcfea
--- /dev/null
+++ b/src/views/tested/status/delay/components/delay.vue
@@ -0,0 +1,483 @@
+<!-- 延用列表 -->
+<script lang="ts" setup name="DeviceStatusList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelStatus, deleteStatus, detailStatus, editStatus, getListPage, submitStatus } from '@/api/eqpt/status/index'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelByname, getModelList } from '@/api/eqpt/device/model'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+import { toTreeList, underlineToHump } from '@/utils/structure'
+import { getDeptList, getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { getPostList } from '@/api/system/post'
+const $props = defineProps({
+  //  审批状态  全部 审批等
+  statusName: {
+    type: String,
+    default: '',
+  },
+  // 设备状态  封存 启封等
+  statusType: {
+    type: String,
+    default: '',
+  },
+})
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const statusDict = ref<{ [key: string]: string }>({
+  1: 'sealpage', // 封存
+  2: 'unsealpage', // 启封
+  3: 'disablepage', // 禁用
+  4: 'scrappage', // 报废
+  5: 'sdelaypage', // 延用
+})
+const formIdDict = ref<{ [key: string]: string }>({
+  1: SCHEDULE.EQUIPMENT_SEALED_APPROVAL,
+  2: SCHEDULE.EQUIPMENT_UNSEALED_APPROVAL,
+  3: SCHEDULE.EQUIPMENT_DISABLE_APPROVAL,
+  4: SCHEDULE.EQUIPMENT_SCRAP_APPROVAL,
+  5: SCHEDULE.EQUIPMENT_DELAY_APPROVAL,
+})
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  approvalNo: '',
+  approvalStatus: '',
+  approvalReason: '',
+  // usePositionId: '',
+  createUserName: '',
+  createTimeStart: '',
+  createTimeEnd: '',
+  deptId: '',
+  companyId: '',
+  approvalType: $props.statusType,
+  // equipmentName: '',
+  // model: '',
+  // equipmentNo: '',
+  formId: formIdDict.value[Number($props.statusType)],
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'approvalNo',
+    align: 'center',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '延用设备数量',
+    value: 'equipmentCount',
+    align: 'center',
+  },
+  {
+    text: '延用原因',
+    value: 'approvalReason',
+    align: 'center',
+  },
+  {
+    text: '延用至',
+    value: 'approvalTime',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取列表数据
+const fetchData = (isNowPage = true) => {
+  list.value = []
+  // total.value = 0
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  }).catch(() => {
+    listLoading.value = false
+  })
+}
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 申请开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+// 重置
+const reset = () => {
+  datetimerange.value = ''
+  listQuery.approvalNo = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createUserName = ''
+  listQuery.createTimeStart = ''
+  // listQuery.usePositionId = ''
+  // listQuery.equipmentName = ''
+  listQuery.approvalReason = ''
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  // listQuery.model = ''
+  // listQuery.equipmentNo = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `${statusDict.value[$props.statusType]}/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      statusType: $props.statusType,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: `${statusDict.value[$props.statusType]}/${'detail'}`,
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+        statusType: $props.statusType,
+      },
+    })
+  }
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    deleteStatus(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelStatus({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitStatus({ id: row.id, formId: formIdDict.value[Number($props.statusType)] }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+const permUrl = ref({
+  add: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/add`,
+  edit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/edit`,
+  del: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/delete`,
+  submit: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/submit`,
+  cancel: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/cancel`,
+  agree: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/agree`,
+  reject: `/tested/status/${statusDict.value[$props.statusType].replace('page', '')}/reject`,
+})
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const modelListAll = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+const fetchDict = () => {
+  // 设备名称
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({ equipmentType: '1' }).then((res) => {
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+    modelListAll.value = res.data
+  })
+  // companyId
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
+// watch(() => listQuery.equipmentName, (newVal) => {
+//   listQuery.model = ''
+//   if (newVal) {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.equipmentName === newVal && item.model).map((item: any) => item.model))).sort()
+//   }
+//   else {
+//     modelList.value = Array.from(new Set(modelListAll.value.filter((item: any) => item.model).map((item: any) => item.model))).sort()
+//   }
+// })
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item> -->
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.deptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.approvalReason" placeholder="延用原因" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-select v-model="listQuery.usePositionId" filterable clearable placeholder="使用岗位">
+          <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </search-item> -->
+      <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="listLoading" :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
+
diff --git a/src/views/tested/status/delay/components/deviceList.vue b/src/views/tested/status/delay/components/deviceList.vue
new file mode 100644
index 0000000..8a14181
--- /dev/null
+++ b/src/views/tested/status/delay/components/deviceList.vue
@@ -0,0 +1,136 @@
+<!-- 主附件信息表格 -->
+<script lang="ts" setup name="AnnextTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+import selectDeviceMultiple from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '规格型号',
+    value: 'model',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufactureNo',
+  },
+  {
+    text: '生产厂家',
+    value: 'manufacturer',
+  },
+  {
+    text: '所在单位',
+    value: 'companyName',
+  },
+  {
+    text: '使用部门',
+    value: 'deptName',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+  },
+  {
+    text: '计量标识',
+    value: 'meterIdentifyName',
+  },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+  },
+  {
+    text: '检定单位',
+    value: 'checkOrganization',
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value as any, '设备列表')
+}
+
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+const deviceRef = ref()
+// 添加行
+const addRow = () => {
+  deviceRef.value.initDialog(true)
+}
+const confirm = (data: any) => {
+  data.forEach((item: any) => {
+    // console.log(item)
+    if (list.value.every((citem: any) => citem.id !== item.id)) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备列表">
+    <select-device-multiple ref="deviceRef" :need-status="true" @add="confirm" />
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" 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 && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index b30564c..22e59aa 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import annexList from './annexList.vue'
+import deviceList from './deviceList.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
 import selectDevice from '@/views/tested/device/group/components/selectDevice.vue'
 import useUserStore from '@/store/modules/user'
@@ -58,6 +59,8 @@
   approvalTime: '',
   approvalType: '',
   attachments: [],
+  equipmentInfos: [],
+  equipmentIds: [],
   companyId: 0,
   companyName: '',
   createTime: '',
@@ -81,6 +84,9 @@
   manufactureNo: '',
   manufacturer: '',
   productCountry: '',
+  usePosition: '',
+  deptName: '',
+  remark: '',
 })
 // 表单1验证规则
 const rules = ref<FormRules>({
@@ -120,6 +126,11 @@
       ruleForm.value.manufacturer = data.manufacturer
       ruleForm.value.manufactureNo = data.manufactureNo
       ruleForm.value.productDate = data.productDate
+      ruleForm.value.manufactureNo = data.manufactureNo
+      ruleForm.value.companyName = data.companyName
+      ruleForm.value.deptName = data.deptName
+      ruleForm.value.usePosition = data.usePosition
+      ruleForm.value.remark = res.data.remark
     })
   }
 }
@@ -131,45 +142,56 @@
   $router.back()
 }
 const annexRef = ref()
+const devicelistRef = ref()
 const disabledSave = ref(false)
 // 保存
 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => {
-  if (!formEl || !formEl1) { return }
-  Promise.all([formEl.validate(), formEl1.validate()]).then(() => {
+  if ($route.query.statusType !== '5') {
+    if (!formEl || !formEl1) { return }
+  }
+  else {
+    if (!formEl1) { return }
+  }
+  ($route.query.statusType !== '5' ? Promise.all([formEl?.validate(), formEl1.validate()]) : Promise.all([formEl1.validate()])).then(() => {
     // 验证表格
-    if (annexRef.value.checkCertificateList()) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        disabledSave.value = true
-        if (submitId.value) {
-          ruleForm.value.id = submitId.value
-        }
-        ruleForm.value.attachments = annexRef.value.list
+    // if (annexRef.value.checkCertificateList()) {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((res) => {
+      disabledSave.value = true
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      if ($route.query.statusType !== '5') {
+        ruleForm.value.attachments = annexRef.value?.list || []
         ruleForm.value.equipmentInfo = undefined
-        editStatus(ruleForm.value).then((res) => {
-          disabledSave.value = false
-          submitId.value = res.data
-          if (statusName === '已取消' || statusName === '未通过') {
-            submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => {
-              ElMessage.success('已提交')
-              close()
-            })
-          }
-          else {
-            ElMessage.success('保存成功')
-          }
-        }).catch(() => {
-          disabledSave.value = false
-        })
+      }
+      else {
+        ruleForm.value.equipmentIds = devicelistRef.value.list.map((item: any) => item.id)
+      }
+      editStatus(ruleForm.value).then((res) => {
+        disabledSave.value = false
+        submitId.value = res.data
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      }).catch(() => {
+        disabledSave.value = false
       })
-    }
+    })
+    // }
   })
 }
 // 提交
@@ -266,6 +288,10 @@
   ruleForm.value.manufactureNo = data.manufactureNo
   ruleForm.value.productDate = data.productDate
   ruleForm.value.productDate = data.productDate
+  ruleForm.value.manufactureNo = data.manufactureNo
+  ruleForm.value.deptName = data.deptName
+  ruleForm.value.companyName = data.companyName
+  ruleForm.value.usePosition = data.usePosition
   // 获取设备 技术指标信息
   getInfoDetail({ equipmentId: row.id }).then((res) => {
     ruleForm.value.attachments = res.data.attachments
@@ -277,7 +303,7 @@
 <template>
   <app-container style="overflow: hidden;">
     <!-- 选择设备弹窗 -->
-    <select-device ref="deviceRef" :status-type="$route.query.statusType as string" :need-status="true" @add="confirm" />
+    <select-device ref="deviceRef" :status-type="$route.query.statusType as string" :limit="10" :need-status="true" @add="confirm" />
     <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`${statusTypeDict[$route.query.statusType as string]}申请-${textMap[dialogStatus]}`">
@@ -316,11 +342,11 @@
               <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="登记表名称">
               <el-input v-model.trim="ruleForm.approvalName" disabled />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="申请人">
               <el-input v-model.trim="ruleForm.createUserName" disabled />
@@ -334,7 +360,7 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="$route.query.statusType !== '5'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
@@ -351,54 +377,74 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" disabled />
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="$route.path.includes('create') ? '设备名称' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="所在单位" prop="companyName">
-              <el-input v-model.trim="ruleForm.companyName" placeholder="所在单位" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="生产国家" prop="productCountry">
-              <el-input v-model.trim="ruleForm.productCountry" placeholder="生产国家" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产厂家" prop="manufacturer">
-              <el-input v-model.trim="ruleForm.manufacturer" placeholder="生产厂家" disabled />
+              <el-input v-model.trim="ruleForm.model" :placeholder="$route.path.includes('create') ? '规格型号' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="出厂编号" prop="manufactureNo">
-              <el-input v-model.trim="ruleForm.manufactureNo" placeholder="出厂编号" disabled />
+              <el-input v-model.trim="ruleForm.manufactureNo" :placeholder="$route.path.includes('create') ? '出厂编号' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="所在单位" prop="companyName">
+              <el-input v-model.trim="ruleForm.companyName" placeholder="所在单位" disabled />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <!-- <el-col :span="6">
+            <el-form-item label="生产国家" prop="productCountry">
+              <el-input v-model.trim="ruleForm.productCountry" placeholder="生产国家" disabled />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="$route.path.includes('create') ? '生产厂家' : ''" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="所在单位">
+              <el-input v-model.trim="ruleForm.companyName" :placeholder="$route.path.includes('create') ? '所在单位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门">
+              <el-input v-model.trim="ruleForm.deptName" :placeholder="$route.path.includes('create') ? '使用部门' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位">
+              <el-input v-model.trim="ruleForm.usePosition" :placeholder="$route.path.includes('create') ? '使用岗位' : ''" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufactureNo">
+              <el-input v-model.trim="ruleForm.manufactureNo" placeholder="出厂编号" disabled />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="6">
             <el-form-item label="生产日期" prop="productDate">
               <el-date-picker
                 v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="请选择生产日期" class="normal-date" style="width: 100%;" disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="ruleForm.attachments.length && $route.query.statusType !== '5'">
       <annex-list ref="annexRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
     </detail-block-com>
-    <detail-block-com>
+    <detail-block-com v-if="$route.query.statusType !== '5'">
       <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
         <el-row v-if="$route.query.statusType !== '4' && $route.query.statusType !== '5' && $route.query.statusType !== '2'" :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item label="设备性能状态" prop="performStatus">
               <el-input v-model.trim="ruleForm.performStatus" placeholder="设备性能状态" />
             </el-form-item>
@@ -412,21 +458,19 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}原因`" prop="approvalReason">
-              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="`${statusTypeDict[$route.query.statusType as string]}原因`" />
+              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="`${statusTypeDict[$route.query.statusType as string]}原因`" type="textarea" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="$route.query.statusType !== '2' && $route.query.statusType !== '5'" :gutter="24" class="marg">
-          <el-col :span="8">
+        <el-row :gutter="24" class="marg">
+          <el-col v-if="$route.query.statusType !== '2' && $route.query.statusType !== '5'" :span="12">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}地点`" prop="approvalAddress">
               <el-input v-model.trim="ruleForm.approvalAddress" :placeholder="`${statusTypeDict[$route.query.statusType as string]}地点`" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="$route.query.statusType !== '2'" :gutter="24" class="marg">
-          <el-col :span="8">
+          <el-col v-if="$route.query.statusType !== '2'" :span="12">
             <el-form-item :label="`${statusTypeDict[$route.query.statusType as string]}时间`" prop="approvalTime">
               <!-- <el-input v-model.trim="ruleForm.approvalTime" /> -->
               <el-date-picker
@@ -436,8 +480,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.remark" :placeholder="$route.path.includes('create') ? '备注' : ''" type="textarea" :rows="2" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 延用申请 -->
+    <detail-block-com v-if="$route.query.statusType === '5'">
+      <el-form
+        ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="延用原因" prop="approvalReason">
+              <el-input v-model.trim="ruleForm.approvalReason" :placeholder="$route.path.includes('create') ? '延用原因' : ''" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="延用至" prop="approvalTime">
+              <el-date-picker
+                v-model="ruleForm.approvalTime" type="date" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" :placeholder="`${statusTypeDict[$route.query.statusType as string]}时间`" class="normal-date" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <!-- 延用设备列表 -->
+    <detail-block-com v-if="$route.query.statusType === '5'">
+      <device-list ref="devicelistRef" :data="ruleForm.equipmentInfos" :status="$route.params.type as string" />
+    </detail-block-com>
     <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 5d4bd3d..090ba91 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -113,7 +113,7 @@
   },
   {
     text: '使用岗位',
-    value: 'deptName',
+    value: 'usePositionName',
     align: 'center',
   },
   {
@@ -166,6 +166,7 @@
 })
 // 重置
 const reset = () => {
+  datetimerange.value = ''
   listQuery.manufactureNo = ''
   listQuery.createTimeEnd = ''
   listQuery.createTimeStart = ''
diff --git a/src/views/tested/status/delay/components/page.vue b/src/views/tested/status/delay/components/page.vue
index 58d3a3d..c3627b7 100644
--- a/src/views/tested/status/delay/components/page.vue
+++ b/src/views/tested/status/delay/components/page.vue
@@ -1,6 +1,7 @@
 <!-- 设备状态管理页面 -->
 <script lang="ts" setup name="DeviceStatusPage">
 import infoList from './list.vue'
+import delayList from './delay.vue'
 import { getDictByCode } from '@/api/system/dict'
 const $props = defineProps({
   // 状态 封存 启封 等
@@ -52,6 +53,11 @@
 
 onMounted(async () => {
   await getMenuStatus()
+  if ($props.statusType === '5') {
+    menu.value.forEach((item) => {
+      item.com = delayList
+    })
+  }
   current.value = ''
   current.value = window.sessionStorage.getItem(`deviceStatus-${$props.statusType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com