Merge remote-tracking branch 'origin/master'

src/utils/dict.ts

@@ -233,5 +233,6 @@ export enum DICT_TYPE {
   MUSEUMS_COLLECTION_STATUS='museums_collection_status',//标本馆藏状态
   MUSEUMS_SOURCE='museums_source',//博物馆标本来源
   MUSEUMS_SPECIMEN_TYPE='museums_specimen_type',//博物馆标本类型
+  MUSEUMS_APPROAL_STATUS='museums_approal_status',//
 
 }

src/views/museums/OutboundForm/OutboundForm.vue

@@ -1,56 +0,0 @@
-<!--<template>-->
-<!--  <Dialog :title="dialogTitle" v-model="dialogVisible">-->
-
-<!--    <template #footer>-->
-<!--      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>-->
-<!--      <el-button @click="dialogVisible = false">取 消</el-button>-->
-<!--    </template>-->
-<!--  </Dialog>-->
-<!--</template>-->
-
-<!--<script setup lang="ts">-->
-
-
-<!--const dialogVisible = ref(false) // 弹窗的是否展示-->
-<!--const formData = ref({-->
-<!--  id: undefined,-->
-<!--  infoId: undefined,-->
-<!--  chineseName: undefined,-->
-<!--  specimenNumber: undefined,-->
-<!--  applicantName: undefined,-->
-<!--  applicationDate: undefined,-->
-<!--  applicationUsage: undefined,-->
-<!--  attachments: undefined,-->
-<!--  status: undefined,-->
-<!--  remarks: undefined,-->
-<!--  processInstanceId: undefined,-->
-<!--  operator: undefined,-->
-<!--  outgoingTime: undefined,-->
-<!--  returner: undefined,-->
-<!--  receiver: undefined,-->
-<!--  returnDate: undefined,-->
-<!--  specimenCondition: undefined,-->
-<!--  sampleStatus: undefined-->
-<!--})-->
-
-
-
-<!--/** 打开弹窗 */-->
-<!--const open = async (type: string, id?: number) => {-->
-<!--  dialogVisible.value = true-->
-<!--  dialogTitle.value = t('action.' + type)-->
-<!--  formType.value = type-->
-<!--  resetForm()-->
-<!--  // 修改时，设置数据-->
-<!--  if (id) {-->
-<!--    formLoading.value = true-->
-<!--    try {-->
-<!--      formData.value = await SpecimenOutboundApi.getSpecimenOutbound(id)-->
-<!--    } finally {-->
-<!--      formLoading.value = false-->
-<!--    }-->
-<!--  }-->
-<!--}-->
-<!--defineExpose({ open }) // 提供 open 方法，用于打开弹窗-->
-
-<!--</script>-->

src/views/museums/OutboundForm/ReturnForm.vue

@@ -1,110 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading">
-      <el-form-item label="退还人" prop="returner">
-        <el-input v-model="formData.returner" placeholder="请输入退还人"/>
-      </el-form-item>
-      <el-form-item label="点收人" prop="receiver">
-        <el-input v-model="formData.receiver" placeholder="请输入点收人"/>
-      </el-form-item>
-      <el-form-item label="退还日期" prop="returnDate">
-        <el-date-picker
-          v-model="formData.returnDate"
-          type="date"
-          value-format="x"
-          placeholder="选择退还日期"
-        />
-      </el-form-item>
-      <el-form-item label="标本情况" prop="specimenCondition">
-        <el-input v-model="formData.specimenCondition" placeholder="请输入标本情况"/>
-      </el-form-item>
-    </el-form>
-
-  </Dialog>
-</template>
-
-<script setup lang="ts">
-import { SpecimenOutboundApi } from '@/api/museums/specimenoutbound'
-import {ref,reactive} from "vue"
-/** 标本出库回库信息 表单 */
-defineOptions({ name: 'ReturnForm' })
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-id: undefined,
-infoId: undefined,
-chineseName: undefined,
-specimenNumber: undefined,
-applicantName: undefined,
-applicationDate: undefined,
-applicationUsage: undefined,
-attachments: undefined,
-status: undefined,
-remarks: undefined,
-processInstanceId: undefined,
-operator: undefined,
-outgoingTime: undefined,
-returner: undefined,
-receiver: undefined,
-returnDate: undefined,
-specimenCondition: undefined,
-sampleStatus: undefined
-})
-
-const formRules = reactive({
-  operator: [{ required: true, message: '出库员不能为空', trigger: 'blur' }],
-  returner: [{ required: true, message: '退还人不能为空', trigger: 'blur' }],
-  receiver: [{ required: true, message: '点收人不能为空', trigger: 'blur' }],
-  returnDate: [{ required: true, message: '退还日期不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  formType.value = type
-  resetForm()
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await SpecimenOutboundApi.getSpecimenOutbound(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    infoId: undefined,
-    chineseName: undefined,
-    specimenNumber: undefined,
-    applicantName: undefined,
-    applicationDate: undefined,
-    applicationUsage: undefined,
-    attachments: undefined,
-    status: undefined,
-    remarks: undefined,
-    processInstanceId: undefined,
-    operator: undefined,
-    outgoingTime: undefined,
-    returner: undefined,
-    receiver: undefined,
-    returnDate: undefined,
-    specimenCondition: undefined,
-    sampleStatus: undefined
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/museums/OutboundForm/outboundDetail.vue

@@ -1,128 +0,0 @@
-<!--<template>-->
-
-<!--  <el-row :gutter="8" justify="space-between">-->
-<!--    <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">-->
-<!--      <div>-->
-<!--        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" >-->
-<!--          <el-card style="margin-bottom: 5px">-->
-
-<!--            <template #header>-->
-<!--              <div class="card-header" style="text-align: center">-->
-<!--                <h1 class="text1">标本出库申请详情</h1>-->
-<!--              </div>-->
-<!--            </template>-->
-<!--            <el-descriptions-->
-
-<!--              v-if="outboundData"-->
-<!--              :column="3"-->
-<!--              :size="small"-->
-<!--              border-->
-
-
-<!--            >-->
-<!--              <el-descriptions-item label="序号:"    label-align="right" >{{ outboundData.id }}</el-descriptions-item>-->
-<!--              <el-descriptions-item label="标本编号"    label-align="right">{{-->
-<!--                  outboundData.number-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="申请人或申请单位:" >{{-->
-<!--                  outboundData.applicantName-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="申请日期:" >{{-->
-<!--                  outboundData.applicationDate-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="申请出库的用途:" >{{-->
-<!--                  outboundData.applicationUsage-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="审批状态:" >{{-->
-<!--                  outboundData.status-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="审批员:">{{-->
-<!--                  outboundData.approveUsers-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="审批时间:">{{-->
-<!--                  outboundData.approvalTime-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="备注信息:" >{{outboundData.remarks}}-->
-<!--              </el-descriptions-item>-->
-<!--            </el-descriptions>-->
-<!--          </el-card>-->
-<!--          <el-card >-->
-<!--              <template #header>-->
-<!--                <div class="card-header" style="text-align: center">-->
-<!--                  <h1 class="text1">标本出库入库详情</h1>-->
-<!--                </div>-->
-<!--              </template>-->
-<!--            <el-descriptions-->
-<!--              v-if="outboundData"-->
-<!--              :column="3"-->
-<!--              :size="small"-->
-<!--              border-->
-<!--            >-->
-<!--              <div >-->
-<!--              <el-descriptions-item label="出库时间:">{{ outboundData.outgoingTime }}</el-descriptions-item>-->
-<!--              <el-descriptions-item label="出库员:">{{  outboundData.operator}}-->
-<!--              </el-descriptions-item>-->
-
-<!--              <el-descriptions-item label="退还日期">{{-->
-<!--                  outboundData.returnDate-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              <el-descriptions-item label="点收人:">{{-->
-<!--                  outboundData.receiver-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-
-
-<!--              <el-descriptions-item label="退还人">{{-->
-<!--                  outboundData.returner-->
-<!--                }}-->
-<!--              </el-descriptions-item>-->
-<!--              </div>-->
-<!--            </el-descriptions>-->
-<!--            </el-card>-->
-
-<!--        </el-col>-->
-<!--      </div>-->
-<!--    </el-col>-->
-<!--  </el-row>-->
-
-<!--</template>-->
-<!--<script setup lang="ts">-->
-<!--import {ElCol} from "element-plus";-->
-<!--import {ref} from "vue";-->
-
-<!--import {SpecimenOutboundApi} from "@/api/museums/specimenoutbound";-->
-<!--const {query} = useRoute() // 查询参数-->
-
-
-
-
-<!--let outboundData = ref(null); // 初始化响应式数据-->
-<!--const fetchData = async () => {-->
-<!--  try {-->
-<!--    console.log(query.dataId)-->
-<!--    let res: any = await SpecimenOutboundApi.getSpecimenOutbound(query.dataId)-->
-<!--    console.log(res)-->
-<!--    outboundData.value = res-->
-<!--    console.log(outboundData.value)-->
-<!--  }  finally {-->
-<!--  }-->
-<!--}-->
-
-<!--// // 在组件加载时获取数据-->
-<!--onMounted(async () => {-->
-<!--  await fetchData()-->
-<!--})-->
-
-<!--</script>-->
-
-<!--<style scoped>-->
-
-<!--</style>-->

src/views/museums/museumsdocument/index.vue

@@ -74,7 +74,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="创建时间"prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -261,4 +261,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>

src/views/museums/specimenoutbound/ApproalProcess.vue

@@ -52,7 +52,10 @@
           clearable
           class="!w-240px"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成"  v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_INFO)"
+                     :key="dict.value"
+                     :label="dict.label"
+                     :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/museums/specimenoutbound/OutboundManagement.vue

@@ -151,7 +151,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：回库 -->
-  <ReturnForm ref="formRef" @success="getList" />
+  <ReturnForm ref="returnFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -251,9 +251,9 @@ const handleOutbound = async (id: number) => {
 }
 
 /** 回库 */
-const formRef = ref()
+const returnFormRef = ref()
 const handleReturn= (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  returnFormRef.value.open(type, id)
 }