Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/museums/specimeninfo/SpecimenImportForm.vue

src/views/museums/photogroup/ImageImportForm .vue

@@ -29,10 +29,11 @@
         />
       </el-form-item>
       <el-form-item label="照片组上传" prop="uploadPhotos">
+<!--        + '&groupDate=' + formData.groupDate      /-->
           <el-upload
             ref="uploadRef"
             v-model:file-list="fileList"
-            :action="importUrl + '?updateSupport=' + updateSupport + '&groupName=' + formData.groupName + '&groupDescription=' + formData.groupDescription"
+            :action="importUrl + '?updateSupport=' + updateSupport + '&groupName=' + formData.groupName + '&groupDescription=' + formData.groupDescription + '&groupDate=' + formData.groupDate"
             :auto-upload="false"
             :disabled="formLoading"
             :headers="uploadHeaders"

src/views/museums/specimeninfo/SpecimenImportForm.vue

@@ -27,6 +27,10 @@
           >
             下载模板
           </el-link>
+          <div class="el-upload__tip">
+            <el-checkbox v-model="updateSupport"/>
+            是否更新已经存在的标本数据
+          </div>
         </div>
       </template>
     </el-upload>
@@ -53,10 +57,10 @@
       <template #tip>
         <div class="el-upload__tip text-center">
           <span>仅允许导入 .zip 格式文件。</span>
-          <div class="el-upload__tip">
-            <el-checkbox v-model="updateSupport"/>
-            是否更新已经存在的标本数据
-          </div>
+<!--          <div class="el-upload__tip">-->
+<!--            <el-checkbox v-model="updateSupport"/>-->
+<!--            是否更新已经存在的标本数据-->
+<!--          </div>-->
         </div>
       </template>
     </el-upload>

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -9,7 +9,8 @@
     >
 
       <el-form-item label="标本编号" prop="specimenNumber">
-        <el-input v-model="formData.specimenNumber" placeholder="请输入标本编号"/>
+          <el-input  v-if="formType=='create'" v-model="formData.specimenNumber" placeholder="请输入标本编号"/>
+          <el-input v-else v-model="formData.specimenNumber" placeholder="请输入标本编号" disabled/>
       </el-form-item>
       <el-form-item label="资产号" prop="assetNumber">
         <el-input v-model="formData.assetNumber" placeholder="请输入资产号"/>
@@ -112,7 +113,8 @@
         <el-input v-model="formData.specimenPrice" placeholder="请输入单价"/>
       </el-form-item>
       <el-form-item label="数量（件/套）" prop="specimenAmount">
-        <el-input v-model="formData.specimenAmount" placeholder="请输入数量"/>
+<!--        <el-input v-model="formData.specimenAmount" placeholder="请输入数量"/>-->
+        <el-input-number v-model="formData.specimenAmount" class="mx-4" :min="1"/>
       </el-form-item>
       <el-form-item label="主要用途" prop="mainPurpose">
         <el-select v-model="formData.mainPurpose" placeholder="请选择主要用途">

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="storageLocation">
         <el-input
           v-model="queryParams.storageLocation"
@@ -657,8 +657,10 @@ const handleDelete = async (id: number) => {
   })
     .then(async ({ value }) =>  {
       try {
+        console.log(111)
         await SpecimenInfoApi.deleteSpecimenInfo(id,value)
-        await getList()
+        console.log(222)
+        getList()
         ElMessage({
           type: 'success',
           message: `删除成功`,