diff --git a/public/config/config.json b/public/config/config.json
index 2db2f06..057ea1b 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,8 @@
 {
   "title":"计量业务系统",
   "versionByEqpt":"1.3.2.0",
-  "baseUrl": "http://111.198.10.15:21609",
-  "baseUrlBusiness": "http://111.198.10.15:21611",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",

diff --git a/public/config/config.json b/public/config/config.json
index 2db2f06..057ea1b 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,8 @@
 {
   "title":"计量业务系统",
   "versionByEqpt":"1.3.2.0",
-  "baseUrl": "http://111.198.10.15:21609",
-  "baseUrlBusiness": "http://111.198.10.15:21611",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/views/tested/status/borrow/components/deviceList.vue b/src/views/tested/status/borrow/components/deviceList.vue
index f2eb85b..9df0e95 100644
--- a/src/views/tested/status/borrow/components/deviceList.vue
+++ b/src/views/tested/status/borrow/components/deviceList.vue
@@ -1,4 +1,3 @@
-<!-- 主附件信息表格 -->
 <script lang="ts" setup name="AnnextTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
@@ -45,12 +44,14 @@
     value: 'meterIdentifyName',
   },
   {
-    text: '证书有效期',
-    value: 'certificateValid',
+    text: '归还日期',
+    value: 'returnDate',
+    type: 'date',
   },
   {
-    text: '检定单位',
-    value: 'checkOrganization',
+    text: '备注',
+    value: 'remark',
+    type: 'input',
   },
 ])
 const list = ref<any[]>([])
@@ -73,7 +74,7 @@
   data.forEach((item: any) => {
     // console.log(item)
     if (list.value.every((citem: any) => citem.id !== item.id)) {
-      list.value.push(item)
+      list.value.push({ ...item, equipmentId: item.id })
     }
   })
 }
@@ -118,7 +119,16 @@
           <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>
+          <span v-if="!item.type || $route.path.includes('detail')">{{ scope.row[item.value] }}</span>
+          <el-date-picker
+            v-if="item.type === 'date' && !$route.path.includes('detail')"
+            v-model="scope.row[item.value]"
+            type="date"
+            placeholder="归还日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input v-if="item.type === 'input' && !$route.path.includes('detail')" v-model="scope.row[item.value]" placeholder="备注" />
         </template>
       </el-table-column>
     </el-table>

diff --git a/public/config/config.json b/public/config/config.json
index 2db2f06..057ea1b 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,8 @@
 {
   "title":"计量业务系统",
   "versionByEqpt":"1.3.2.0",
-  "baseUrl": "http://111.198.10.15:21609",
-  "baseUrlBusiness": "http://111.198.10.15:21611",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/views/tested/status/borrow/components/deviceList.vue b/src/views/tested/status/borrow/components/deviceList.vue
index f2eb85b..9df0e95 100644
--- a/src/views/tested/status/borrow/components/deviceList.vue
+++ b/src/views/tested/status/borrow/components/deviceList.vue
@@ -1,4 +1,3 @@
-<!-- 主附件信息表格 -->
 <script lang="ts" setup name="AnnextTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
@@ -45,12 +44,14 @@
     value: 'meterIdentifyName',
   },
   {
-    text: '证书有效期',
-    value: 'certificateValid',
+    text: '归还日期',
+    value: 'returnDate',
+    type: 'date',
   },
   {
-    text: '检定单位',
-    value: 'checkOrganization',
+    text: '备注',
+    value: 'remark',
+    type: 'input',
   },
 ])
 const list = ref<any[]>([])
@@ -73,7 +74,7 @@
   data.forEach((item: any) => {
     // console.log(item)
     if (list.value.every((citem: any) => citem.id !== item.id)) {
-      list.value.push(item)
+      list.value.push({ ...item, equipmentId: item.id })
     }
   })
 }
@@ -118,7 +119,16 @@
           <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>
+          <span v-if="!item.type || $route.path.includes('detail')">{{ scope.row[item.value] }}</span>
+          <el-date-picker
+            v-if="item.type === 'date' && !$route.path.includes('detail')"
+            v-model="scope.row[item.value]"
+            type="date"
+            placeholder="归还日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input v-if="item.type === 'input' && !$route.path.includes('detail')" v-model="scope.row[item.value]" placeholder="备注" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue
index c981330..61f4b21 100644
--- a/src/views/tested/status/borrow/components/edit.vue
+++ b/src/views/tested/status/borrow/components/edit.vue
@@ -68,6 +68,14 @@
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
 // 单位companyId
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 所有部门单位
+const deptAllList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+    deptAllList.value = toTreeList(res.data.list.map((item: any) => ({ ...item, label: item.simpleName, id: item.deptId, value: item.deptId })).filter((item: any) => item.label !== '顶级'))
+  })
+}
+fetchDict()
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
@@ -83,7 +91,7 @@
         isAdmin.value = false
         ruleForm.value.companyId = res.data.id
         ruleForm.value.companyName = res.data.fullName
-        ruleForm.value.deptName = userStore.deptId
+        ruleForm.value.deptId = userStore.deptId
         ruleForm.value.deptName = userStore.deptName
       }
     })
@@ -97,7 +105,7 @@
   }
   else {
     const data = JSON.parse($route.query.row as string)
-    detailBorrow(data.id).then((res) => {
+    detailBorrow({ id: data.id }).then((res) => {
       ruleForm.value = res.data
       setTimeout(() => {
         isFrist.value = false
@@ -122,16 +130,22 @@
 onMounted(() => {
   initDialog()
 })
+
 // 关闭弹窗
 const close = () => {
   $router.back()
 }
 const devicelistRef = ref()
 const disabledSave = ref(false)
+const formId = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   Promise.all([formEl.validate()]).then(() => {
+    if (!devicelistRef.value.list.length) {
+      ElMessage.warning('设备不能为空')
+      return
+    }
     ElMessageBox.confirm(
       '确认保存吗？',
       '提示',
@@ -140,21 +154,25 @@
         cancelButtonText: '取消',
         type: 'warning',
       },
-    ).then((res) => {
+    ).then(async (res) => {
       disabledSave.value = true
       if (submitId.value) {
         ruleForm.value.id = submitId.value
       }
+      const formid = await getFormId(ruleForm.value.deptId)
+      formId.value = formid.data
+      ruleForm.value.formId = formid.data
+      ruleForm.value.relationList = devicelistRef.value.list
       editBorrow(ruleForm.value).then((res) => {
         disabledSave.value = false
         submitId.value = res.data
         if (statusName === '已取消' || statusName === '未通过') {
-          getFormId(row.id).then((res) => {
-            submitStatus({ id: submitId.value, formId: res.data }).then((res) => {
-              ElMessage.success('已提交')
-              close()
-            })
+          // getFormId(submitId.value).then((res) => {
+          submitBorrow({ id: submitId.value, formId: formId.value }).then((res) => {
+            ElMessage.success('已提交')
+            close()
           })
+          // })
         }
         else {
           ElMessage.success('保存成功')
@@ -181,12 +199,12 @@
       type: 'warning',
     },
   ).then((res) => {
-    getFormId(row.id).then((res) => {
-      submitBorrow({ id: submitId.value, formId: res.data }).then((res) => {
-        ElMessage.success('已提交')
-        close()
-      })
+    // getFormId(ruleForm.value.deptId).then((res) => {
+    submitBorrow({ id: submitId.value, formId: formId.value }).then((res) => {
+      ElMessage.success('已提交')
+      close()
     })
+    // })
   })
 }
 // 取消
@@ -205,7 +223,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除借用信息吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -242,6 +260,13 @@
   const data = JSON.parse($route.query.row as string)
   approvalDialogRef.value.initDialog(type, JSON.parse($route.query.row as string).taskId, data.processId, ruleForm.value.id)
 }
+watch(() => devicelistRef.value?.list, (newVal) => {
+  if (newVal) {
+    ruleForm.value.equipmentCount = newVal.length
+  }
+}, {
+  deep: true,
+})
 defineExpose({ ruleForm, apply, editForm, submitForm, saveForm, delForm, print, cancelForm })
 </script>
 
@@ -282,54 +307,59 @@
       :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <detail-block-com>
-        <el-form label-position="right" label-width="110px" class="form" :disabled="$route.path.includes('detail')">
-          <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="文件编号">
-                <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="所在单位" prop="companyId">
-                <!-- <el-input v-model.trim="ruleForm.companyName" disabled /> -->
-                <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
-                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-                <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用部门">
-                <!-- <el-input v-model.trim="ruleForm.deptName" disabled /> -->
-                <el-input v-if="$route.path.includes('detail') || !isAdmin" v-model.trim="ruleForm.deptName" disabled />
-                <el-tree-select
-                  v-else
-                  v-model="ruleForm.deptId"
-                  style="width: 100%;"
-                  :data="deptList"
-                  :render-after-expand="false"
-                  check-strictly
-                  placeholder="使用部门"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="申请人">
-                <el-input v-model.trim="ruleForm.approvalUserName" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="申请时间">
-                <el-input v-model.trim="ruleForm.approvalTime" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="借用部门" prop="borrowDeptId">
-                <el-input v-model.trim="ruleForm.borrowDeptId" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文件编号">
+              <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所在单位" prop="companyId">
+              <!-- <el-input v-model.trim="ruleForm.companyName" disabled /> -->
+              <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
+                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="deptId">
+              <!-- <el-input v-model.trim="ruleForm.deptName" disabled /> -->
+              <el-input v-if="$route.path.includes('detail') || !isAdmin" v-model.trim="ruleForm.deptName" disabled />
+              <el-tree-select
+                v-else
+                v-model="ruleForm.deptId"
+                style="width: 100%;"
+                :data="deptList"
+                :render-after-expand="false"
+                check-strictly
+                placeholder="使用部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人">
+              <el-input v-model.trim="ruleForm.approvalUserName" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间">
+              <el-input v-model.trim="ruleForm.approvalTime" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用部门" prop="borrowDeptId">
+              <!-- <el-input v-model.trim="ruleForm.borrowDeptId" /> -->
+              <el-tree-select
+                v-model="ruleForm.borrowDeptId"
+                :data="deptAllList"
+                check-strictly
+                :render-after-expand="false"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </detail-block-com>
       <detail-block-com>
         <el-row :gutter="24" class="marg">
@@ -352,6 +382,7 @@
       </detail-block-com>
     </el-form>
     <!-- <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" /> -->
+    <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 

diff --git a/public/config/config.json b/public/config/config.json
index 2db2f06..057ea1b 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,8 @@
 {
   "title":"计量业务系统",
   "versionByEqpt":"1.3.2.0",
-  "baseUrl": "http://111.198.10.15:21609",
-  "baseUrlBusiness": "http://111.198.10.15:21611",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/views/tested/status/borrow/components/deviceList.vue b/src/views/tested/status/borrow/components/deviceList.vue
index f2eb85b..9df0e95 100644
--- a/src/views/tested/status/borrow/components/deviceList.vue
+++ b/src/views/tested/status/borrow/components/deviceList.vue
@@ -1,4 +1,3 @@
-<!-- 主附件信息表格 -->
 <script lang="ts" setup name="AnnextTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useCheckList } from '@/utils/useCheckList'
@@ -45,12 +44,14 @@
     value: 'meterIdentifyName',
   },
   {
-    text: '证书有效期',
-    value: 'certificateValid',
+    text: '归还日期',
+    value: 'returnDate',
+    type: 'date',
   },
   {
-    text: '检定单位',
-    value: 'checkOrganization',
+    text: '备注',
+    value: 'remark',
+    type: 'input',
   },
 ])
 const list = ref<any[]>([])
@@ -73,7 +74,7 @@
   data.forEach((item: any) => {
     // console.log(item)
     if (list.value.every((citem: any) => citem.id !== item.id)) {
-      list.value.push(item)
+      list.value.push({ ...item, equipmentId: item.id })
     }
   })
 }
@@ -118,7 +119,16 @@
           <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>
+          <span v-if="!item.type || $route.path.includes('detail')">{{ scope.row[item.value] }}</span>
+          <el-date-picker
+            v-if="item.type === 'date' && !$route.path.includes('detail')"
+            v-model="scope.row[item.value]"
+            type="date"
+            placeholder="归还日期"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
+          <el-input v-if="item.type === 'input' && !$route.path.includes('detail')" v-model="scope.row[item.value]" placeholder="备注" />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/status/borrow/components/edit.vue b/src/views/tested/status/borrow/components/edit.vue
index c981330..61f4b21 100644
--- a/src/views/tested/status/borrow/components/edit.vue
+++ b/src/views/tested/status/borrow/components/edit.vue
@@ -68,6 +68,14 @@
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
 // 单位companyId
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 所有部门单位
+const deptAllList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+    deptAllList.value = toTreeList(res.data.list.map((item: any) => ({ ...item, label: item.simpleName, id: item.deptId, value: item.deptId })).filter((item: any) => item.label !== '顶级'))
+  })
+}
+fetchDict()
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
@@ -83,7 +91,7 @@
         isAdmin.value = false
         ruleForm.value.companyId = res.data.id
         ruleForm.value.companyName = res.data.fullName
-        ruleForm.value.deptName = userStore.deptId
+        ruleForm.value.deptId = userStore.deptId
         ruleForm.value.deptName = userStore.deptName
       }
     })
@@ -97,7 +105,7 @@
   }
   else {
     const data = JSON.parse($route.query.row as string)
-    detailBorrow(data.id).then((res) => {
+    detailBorrow({ id: data.id }).then((res) => {
       ruleForm.value = res.data
       setTimeout(() => {
         isFrist.value = false
@@ -122,16 +130,22 @@
 onMounted(() => {
   initDialog()
 })
+
 // 关闭弹窗
 const close = () => {
   $router.back()
 }
 const devicelistRef = ref()
 const disabledSave = ref(false)
+const formId = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   Promise.all([formEl.validate()]).then(() => {
+    if (!devicelistRef.value.list.length) {
+      ElMessage.warning('设备不能为空')
+      return
+    }
     ElMessageBox.confirm(
       '确认保存吗？',
       '提示',
@@ -140,21 +154,25 @@
         cancelButtonText: '取消',
         type: 'warning',
       },
-    ).then((res) => {
+    ).then(async (res) => {
       disabledSave.value = true
       if (submitId.value) {
         ruleForm.value.id = submitId.value
       }
+      const formid = await getFormId(ruleForm.value.deptId)
+      formId.value = formid.data
+      ruleForm.value.formId = formid.data
+      ruleForm.value.relationList = devicelistRef.value.list
       editBorrow(ruleForm.value).then((res) => {
         disabledSave.value = false
         submitId.value = res.data
         if (statusName === '已取消' || statusName === '未通过') {
-          getFormId(row.id).then((res) => {
-            submitStatus({ id: submitId.value, formId: res.data }).then((res) => {
-              ElMessage.success('已提交')
-              close()
-            })
+          // getFormId(submitId.value).then((res) => {
+          submitBorrow({ id: submitId.value, formId: formId.value }).then((res) => {
+            ElMessage.success('已提交')
+            close()
           })
+          // })
         }
         else {
           ElMessage.success('保存成功')
@@ -181,12 +199,12 @@
       type: 'warning',
     },
   ).then((res) => {
-    getFormId(row.id).then((res) => {
-      submitBorrow({ id: submitId.value, formId: res.data }).then((res) => {
-        ElMessage.success('已提交')
-        close()
-      })
+    // getFormId(ruleForm.value.deptId).then((res) => {
+    submitBorrow({ id: submitId.value, formId: formId.value }).then((res) => {
+      ElMessage.success('已提交')
+      close()
     })
+    // })
   })
 }
 // 取消
@@ -205,7 +223,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除借用信息吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -242,6 +260,13 @@
   const data = JSON.parse($route.query.row as string)
   approvalDialogRef.value.initDialog(type, JSON.parse($route.query.row as string).taskId, data.processId, ruleForm.value.id)
 }
+watch(() => devicelistRef.value?.list, (newVal) => {
+  if (newVal) {
+    ruleForm.value.equipmentCount = newVal.length
+  }
+}, {
+  deep: true,
+})
 defineExpose({ ruleForm, apply, editForm, submitForm, saveForm, delForm, print, cancelForm })
 </script>
 
@@ -282,54 +307,59 @@
       :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <detail-block-com>
-        <el-form label-position="right" label-width="110px" class="form" :disabled="$route.path.includes('detail')">
-          <el-row :gutter="24" class="marg">
-            <el-col :span="6">
-              <el-form-item label="文件编号">
-                <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="所在单位" prop="companyId">
-                <!-- <el-input v-model.trim="ruleForm.companyName" disabled /> -->
-                <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
-                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-                <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用部门">
-                <!-- <el-input v-model.trim="ruleForm.deptName" disabled /> -->
-                <el-input v-if="$route.path.includes('detail') || !isAdmin" v-model.trim="ruleForm.deptName" disabled />
-                <el-tree-select
-                  v-else
-                  v-model="ruleForm.deptId"
-                  style="width: 100%;"
-                  :data="deptList"
-                  :render-after-expand="false"
-                  check-strictly
-                  placeholder="使用部门"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="申请人">
-                <el-input v-model.trim="ruleForm.approvalUserName" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="申请时间">
-                <el-input v-model.trim="ruleForm.approvalTime" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="借用部门" prop="borrowDeptId">
-                <el-input v-model.trim="ruleForm.borrowDeptId" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文件编号">
+              <el-input v-model.trim="ruleForm.approvalNo" disabled placeholder="系统自动生成" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所在单位" prop="companyId">
+              <!-- <el-input v-model.trim="ruleForm.companyName" disabled /> -->
+              <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
+                <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="deptId">
+              <!-- <el-input v-model.trim="ruleForm.deptName" disabled /> -->
+              <el-input v-if="$route.path.includes('detail') || !isAdmin" v-model.trim="ruleForm.deptName" disabled />
+              <el-tree-select
+                v-else
+                v-model="ruleForm.deptId"
+                style="width: 100%;"
+                :data="deptList"
+                :render-after-expand="false"
+                check-strictly
+                placeholder="使用部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人">
+              <el-input v-model.trim="ruleForm.approvalUserName" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间">
+              <el-input v-model.trim="ruleForm.approvalTime" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="借用部门" prop="borrowDeptId">
+              <!-- <el-input v-model.trim="ruleForm.borrowDeptId" /> -->
+              <el-tree-select
+                v-model="ruleForm.borrowDeptId"
+                :data="deptAllList"
+                check-strictly
+                :render-after-expand="false"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </detail-block-com>
       <detail-block-com>
         <el-row :gutter="24" class="marg">
@@ -352,6 +382,7 @@
       </detail-block-com>
     </el-form>
     <!-- <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" /> -->
+    <approval-record-table v-if="!$route.path.includes('create') && statusName !== '草稿箱'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/status/borrow/components/list.vue b/src/views/tested/status/borrow/components/list.vue
index d0694ed..16861b6 100644
--- a/src/views/tested/status/borrow/components/list.vue
+++ b/src/views/tested/status/borrow/components/list.vue
@@ -149,6 +149,7 @@
 }
 // 详情
 const detail = (row: any) => {
+  console.log($props.statusName, '$props.statusName')
   if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
     handler(row, 'update')
   }
@@ -208,12 +209,12 @@
       type: 'warning',
     },
   ).then((res) => {
-    getFormId(row.id).then((res) => {
-      submitBorrow({ id: row.id, formId: res.data }).then((res) => {
-        ElMessage.success('已提交')
-        search()
-      })
+    // getFormId(row.borrowDeptId).then((res) => {
+    submitBorrow({ id: row.id, formId: row.formId }).then((res) => {
+      ElMessage.success('已提交')
+      search()
     })
+    // })
   })
 }
 // 同意拒绝