标本出入库页面

src/api/system/Out/index.ts

@@ -2,8 +2,8 @@ import request from '@/config/axios'
 
 export interface OouBoundVO {
   id :number;
-  number:string;
-  sampleName: string;
+  number:[];
+  sampleName: [];
   outboundPerson :string;
   outboundTime:Date;
   purpose :string;
@@ -13,64 +13,64 @@ export interface OouBoundVO {
   applyTime:Date;
   returnExpect:string;
   reviewPerson:string;
-  reviewTime: LocalDateTime;
+  reviewTime: Date;
   rejectSeason:string;
   returnPerson:string;
-  returnTime:LocalDateTime;
+  returnTime:Date;
   receivePerson:string;
   annexReturn:string;
   nots:string;
-  state:Integer;
+  state:number;
 }
 
 export interface UpdateStatusReqVO {
   id: number
   status: number
 }
-
+// 分页
 export const getPage = (params) => {
-  return request.get({ url: '/museum/flow/pagePerson', params })
-}
-
-// 查询角色列表
-export const getRolePage = async (params: PageParam) => {
-  return await request.get({ url: '/system/Out/page', params })
-}
-
-// 查询角色（精简)列表
-export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
-  return await request.get({ url: '/system/role/simple-list' })
-}
-
-// 查询角色详情
-export const getRole = async (id: number) => {
-  return await request.get({ url: '/system/Out/get?id=' + id })
+  return request.get({ url: '/museum/flow/page', params })
 }
 
-// 新增出库表单
+// // 查询角色列表
+// export const getRolePage = async (params: PageParam) => {
+//   return await request.get({ url: '/system/Out/page', params })
+// }
+//
+// // 查询角色（精简)列表
+// export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
+//   return await request.get({ url: '/system/role/simple-list' })
+// }
+//
+// // 查询角色详情
+// export const getRole = async (id: number) => {
+//   return await request.get({ url: '/system/Out/get?id=' + id })
+// }
+//
+// // 新增出库表单
 export const createOutBound = async (data) => {
   return await request.post({ url: '/museum/flow/outbound', data })
 }
-
-// 跟新表单
-export const updateForm = async (data) => {
-  return await request.put({ url: '/museum/flow/update', data })
-}
-
-// 修改角色状态
-export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
-  return await request.put({ url: '/system/Out/update-status', data })
-}
-
-// 删除角色
-export const deleteRole = async (id: number) => {
-  return await request.delete({ url: '/system/Out/delete?id=' + id })
-}
-
-// 导出角色
-export const exportRole = (params) => {
-  return request.download({
-    url: '/system/Out/export-excel',
-    params
-  })
-}
+//
+// // 跟新表单
+// export const updateForm = async (data) => {
+//   return await request.put({ url: '/museum/flow/update', data })
+// }
+//
+// // 修改角色状态
+// export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
+//   return await request.put({ url: '/system/Out/update-status', data })
+// }
+//
+// // 删除角色
+// export const deleteRole = async (id: number) => {
+//   return await request.delete({ url: '/system/Out/delete?id=' + id })
+// }
+//
+// // 导出角色
+// export const exportRole = (params) => {
+//   return request.download({
+//     url: '/system/Out/export-excel',
+//     params
+//   })
+// }

src/views/system/Out/OutForm.vue

@@ -1,11 +1,11 @@
 <template>
   <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form
+    <el-form-item
       ref="formRef"
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="100px"
     >
 <!--      <el-form-item label="出库标本">-->
 <!--        <el-select v-model="formData.number" clearable placeholder="请选择出库标本">-->
@@ -30,21 +30,39 @@
 <!--      </el-form-item>-->
 
 
-      <el-form-item label="申请编号" prop="id">
-        <el-input
-          v-model="formData.id"
-          class="!w-240px"
-          placeholder="请输入申请编号"
-        />
-      </el-form-item>
+<!--      <el-form-item label="申请编号" prop="id">-->
+<!--        <el-input-->
+<!--          v-model="formData.id"-->
+<!--          class="!w-240px"-->
+<!--          placeholder="请输入申请编号"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="标本编号" prop="number">
         <el-input v-model="formData.number" placeholder="请输入标本编号" />
       </el-form-item>
+      <el-form-item label="申请人" prop="applyPerson">
+        <el-input v-model="formData.applyPerson" placeholder="请输入申请人" />
+      </el-form-item>
+      <el-form-item label="申请单位" prop="applyUnit">
+        <el-input v-model="formData.numbapplyUniter" placeholder="请输入申请单位" />
+      </el-form-item>
+      <el-form-item label="预计退还时间" prop="returnExpect">
+<!--        <el-input v-model="formData.returnExpect" placeholder="请输入时间" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item-->
+        <el-date-picker
+        v-model="formData.returnExpect"
+        range-separator="-"
+        placeholder="退还时间"
 
+      />
+      </el-form-item>
+      <el-form-item label="目的" prop="purpose">
+        <el-input v-model="formData.purpose" placeholder="请输入目的" />
+      </el-form-item>
 
-
-    </el-form>
-    <template #footer>
+    </el-form-item>
+    <template class="footer">
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
@@ -57,6 +75,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import * as OutBoundApi from '@/api/system/Out'
 import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 import {updateForm} from "@/api/system/Out";
+import {jsonParse} from "@/utils";
 
 
 defineOptions({ name: 'SystemOutForm' })
@@ -76,7 +95,7 @@ const formData = ref({
   // status: CommonStatusEnum.ENABLE,
   // remark: ''
 
-  number:""
+  number:[]
 })
 const formRules = reactive({
  })
@@ -120,6 +139,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as OutBoundApi.OouBoundVO
+    data.number =jsonParse(data.number)
     if (formType.value === 'create') {
       console.log(data,'新增时')
       await OutBoundApi.createOutBound(data)

src/views/system/Out/iker（出库管理）.vue

@@ -263,7 +263,8 @@ const openForm = (type: string, id?: number) => {
 //     loading.value = false
 //   }
 // }
-// onMounted(() => {
-//   getList()
-// })
+
+onMounted( ()=>{
+  getList();
+})
 </script>

src/views/system/Out/index（出库申请）.vue

@@ -8,11 +8,11 @@
       class="-mb-15px"
       label-width="100px"
     >
-      <el-form-item label="申请编号" prop="id">
+      <el-form-item label="标本编号" prop="id">
         <el-input
           v-model="queryParams.id"
           class="!w-240px"
-          placeholder="请输入申请编号"
+          placeholder="请输入标本编号"
         />
       </el-form-item>
       <el-form-item label="标本名称" prop="sampleName">
@@ -61,8 +61,18 @@
 <!--  列表-->
   <ContentWrap>
       <el-table v-loading="loading" :data="list">
-        <el-table-column align="center" label="申请编号" prop="id" width="100" />
+<!--        <el-table-column align="center" label="标本编号" prop="id" width="100" />-->
         <el-table-column label="标本编号" align="center" prop="number" width="120" />
+
+        <el-table-column label="申请单位" align="center" prop="applyUnit" width="120" />
+        <el-table-column label="退还时间" align="center" prop="returnExpect" width="120" />
+
+        <el-table-column label="目的" align="center" prop="purpose" width="120" />
+
+
+
+
+
 <!--        <el-table-column label="出库类型" align="center" prop="outType" width="120">-->
 <!--          <template #default="scope">-->
 <!--            <dict-tag :type="DICT_TYPE.SPECIMEN_OUT_TYPE" :value="scope.row.outType" />-->