2 Commits 4b4eb28259 ... 5b65c22587

Author SHA1 Message Date
  wwj 5b65c22587 Merge remote-tracking branch 'origin/master' 1 month ago
  lmm ad3dc61fc3 Merge remote-tracking branch 'origin/master' 2 months ago

+ 1 - 1
src/layout/components/Logo/src/Logo.vue

@@ -62,7 +62,7 @@ watch(
       :class="[
         prefixCls,
         layout !== 'classic' ? `${prefixCls}__Top` : '',
-        'flex !h-[var(--logo-height)] items-center cursor-pointer pl-8px relative decoration-none overflow-hidden'
+        'flex !h-[var(--logo-height)] items-center cursor-pointer pl-2px relative decoration-none overflow-hidden'
       ]"
       to="/"
     >

+ 1 - 1
src/views/museums/specimeninfo/SpecimenImportForm.vue

@@ -179,7 +179,7 @@ const submitFormSuccess = (response: any) => {
       text += '图片名称:' + specimenInfodata + '、'
     }
   }
-  if(JSON.stringify(data.failureSpecimenImages) != '{}') {
+  if(JSON.stringify(data.failureSpecimenImages) != '{}' &&data.failureSpecimenImages != null) {
     text = '图片上传失败数量:' + Object.keys(data.failureSpecimenImages).length + ';'
     for (let specimenInfodata of data.failureSpecimenImages) {
       text += '< ' + specimenInfodata + ': ' + data.failureSpecimenImages[specimenInfodata] + ' >'

+ 5 - 1
src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -384,7 +384,11 @@ const resetForm = () => {
     imagePath: [],
     deletedReason: undefined,
     operator: undefined,
-    entryDate: undefined
+    entryDate: undefined,
+    mainPurpose: undefined,
+    saveStatus: undefined,
+    country: undefined,
+    economize: undefined
   }
   formRef.value?.resetFields()
 }