Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -132,11 +132,11 @@
       <el-form-item label="备注" prop="notes">
         <el-input v-model="formData.notes" placeholder="请输入备注"/>
       </el-form-item>
-      <el-form-item label="图片名称" prop="imageName">
-        <el-input v-model="formData.imageName" placeholder="请输入图片名称"/>
-      </el-form-item>
+<!--      <el-form-item label="图片名称" prop="imageName">-->
+<!--        <el-input v-model="formData.imageName" placeholder="请输入图片名称"/>-->
+<!--      </el-form-item>-->
             <el-form-item label="图片路径" prop="imagePath">
-              <UploadImg v-model="formData.imagePath" />
+              <UploadImgs v-model="formData.imagePath" />
 <!--              <el-upload-->
 <!--                v-model="formData.imagePath"-->
 <!--                class="upload-demo"-->
@@ -225,7 +225,7 @@ const formData = ref({
   collectionStatus: undefined,
   notes: undefined,
   imageName: undefined,
-  imagePath: undefined,
+  imagePath: [],
   deletedReason: undefined,
   operator: undefined,
   entryDate: undefined
@@ -267,6 +267,7 @@ defineExpose({open}) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  console.log('formData.value',formData.value)
   // 校验表单
   await formRef.value.validate()
   // 提交请求
@@ -342,7 +343,7 @@ const resetForm = () => {
     collectionStatus: undefined,
     notes: undefined,
     imageName: undefined,
-    imagePath: undefined,
+    imagePath:[],
     deletedReason: undefined,
     operator: undefined,
     entryDate: undefined

src/views/museums/specimeninfo/index.vue

@@ -28,21 +28,21 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="标本类型" prop="specimenType">
-        <el-select
-          v-model="queryParams.specimenType"
-          placeholder="请选择标本类型（矿物、岩石矿石、化石、陨石）"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="标本类型" prop="specimenType">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.specimenType"-->
+<!--          placeholder="请选择标本类型（矿物、岩石矿石、化石、陨石）"-->
+<!--          clearable-->
+<!--          class="!w-240px"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="资产号" prop="assetNumber">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.assetNumber"-->
@@ -340,6 +340,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-segmented  block  v-model="queryParams.specimenType" :options="options" size="large"  @update:modelValue="handleSegmentedChange"/>
+
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
 <!--      <el-table-column label="序号" align="center" prop="id" />-->
@@ -390,7 +392,6 @@
         <template #default="{ row }">
         <div class="demo-image__preview" v-if="queryParams">
           <el-image
-
             style="width: 40px; height:40px"
             class="h-80px w-80px"
             lazy
@@ -469,14 +470,21 @@ defineOptions({ name: 'SpecimenInfo' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const options = [
+  { label: '总表', value: '' },
+  { label: '矿物', value: '0' },
+  { label: '岩石', value: '1' },
+  { label: '矿石', value: '2' },
+  { label: '化石', value: '3' },
+  { label: '陨石', value: '4' }
+]
 const loading = ref(true) // 列表的加载中
 const list = ref<SpecimenInfoVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  specimenType: undefined,
+  specimenType:'',
   specimenNumber: undefined,
   assetNumber: undefined,
   storageLocation: undefined,
@@ -596,6 +604,10 @@ const viewDetails=(dataId: number) => {
     }
   })
 }
-
+/** 处理 el-segmented 变化事件 */
+const handleSegmentedChange = (value: string) => {
+  queryParams.specimenType = value
+  handleQuery()
+}
 </script>