Merge remote-tracking branch 'origin/master'

src/views/museums/specimenoutbound/OutboundForm/outboundDetail.vue

@@ -112,67 +112,26 @@
                     label-class-name="my-label"
                     class-name="my-content"
                   >
-                    <div v-if="outboundData.attachments && outboundData.attachments.type && outboundData.attachments.type.includes('image')" class="image-container">
-                      <el-image
-                        class="h-80px w-80px"
-                        lazy
-                        :src="outboundData.attachments"
-                        :preview-src-list="outboundData.attachments ? [outboundData.attachments] : []"
-                        preview-teleported
-                        fit="cover"
-                      />
-                    </div>
-                    <el-link
-                      v-else-if="outboundData.attachments"
-                      type="primary"
-                      :href="outboundData.attachments"
-                      :underline="false"
-                      target="_blank"
-                    >下载</el-link>
-
-<!--                    <div v-if="outboundData.attachments && outboundData.attachments.type('image')" class="image-container">-->
+<!--                    <div v-if="outboundData.attachments && outboundData.attachments.type && outboundData.attachments.type.includes('image')" class="image-container">-->
 <!--                      <el-image-->
 <!--                        class="h-80px w-80px"-->
 <!--                        lazy-->
-<!--                        :src="outboundData.attachments.url"-->
-<!--                        :preview-src-list="[attachments]"-->
+<!--                        :src="outboundData.attachments"-->
+<!--                        :preview-src-list="outboundData.attachments ? [outboundData.attachments] : []"-->
 <!--                        preview-teleported-->
 <!--                        fit="cover"-->
 <!--                      />-->
 <!--                    </div>-->
 <!--                    <el-link-->
-<!--                      v-else-if="outboundData.attachments && outboundData.attachments.type.includes('pdf')"-->
-<!--                      type="primary"-->
-<!--                      :href="outboundData.attachments"-->
-<!--                      :underline="false"-->
-<!--                      target="_blank"-->
-<!--                    >预览</el-link>-->
-<!--                    <el-link-->
-<!--                      v-else-->
+<!--                      v-else-if="outboundData.attachments"-->
 <!--                      type="primary"-->
-<!--                      download-->
 <!--                      :href="outboundData.attachments"-->
 <!--                      :underline="false"-->
 <!--                      target="_blank"-->
 <!--                    >下载</el-link>-->
-
-
-                    <!--                    <div class="demo-image__preview" v-if="outboundData" >-->
-
-                    <!--                      <el-image-->
-                    <!--                        style="width: 40px; height:40px;margin-right: 5px"-->
-                    <!--                        class="h-80px w-80px"-->
-                    <!--                        lazy-->
-                    <!--                        :src="outboundData.attachments"-->
-                    <!--                        :preview-src-list="outboundData.attachments"-->
-                    <!--                        preview-teleported-->
-                    <!--                        fit="cover"-->
-
-
-                    <!--                      />-->
-
-                    <!--                  </div>-->
-
+                    <div class="demo-image__preview" v-if="outboundData">
+                      <a :href="outboundData.attachments" target="_blank">下载附件</a>
+                    </div>
                   </el-descriptions-item>
                   <el-descriptions-item
                     :rowspan="4"
@@ -181,37 +140,29 @@
                     align="center"
                     label-class-name="my-label"
                     class-name="my-content"
-                  ><div class="demo-image__preview" v-if="outboundData" >
-
-<!--                    <el-image-->
-<!--                      style="width: 40px; height:40px;margin-right: 5px"-->
-<!--                      class="h-80px w-80px"-->
-<!--                      lazy-->
-<!--                      :src="outboundData.sampleStatus"-->
-<!--                      :preview-src-list="outboundData.sampleStatus"-->
-<!--                      preview-teleported-->
-<!--                      fit="cover"-->
-
+                  >
 
-<!--                    />-->
-                    <div v-if="outboundData.sampleStatus && outboundData.sampleStatus.type && outboundData.sampleStatus.type.includes('image')" class="image-container">
-                      <el-image
-                        class="h-80px w-80px"
-                        lazy
-                        :src="outboundData.sampleStatus"
-                        :preview-src-list="outboundData.sampleStatus ? [outboundData.sampleStatus] : []"
-                        preview-teleported
-                        fit="cover"
-                      />
+                    <div class="demo-image__preview" v-if="outboundData">
+                      <a :href="outboundData.sampleStatus" target="_blank">下载附件</a>
                     </div>
-                    <el-link
-                      v-else-if="outboundData.sampleStatus"
-                      type="primary"
-                      :href="outboundData.sampleStatus"
-                      :underline="false"
-                      target="_blank"
-                    >下载</el-link>
-                  </div>
+<!--                    <div v-if="outboundData.sampleStatus && outboundData.sampleStatus.type && outboundData.sampleStatus.type.includes('image')" class="image-container">-->
+<!--                      <el-image-->
+<!--                        class="h-80px w-80px"-->
+<!--                        lazy-->
+<!--                        :src="outboundData.sampleStatus"-->
+<!--                        :preview-src-list="outboundData.sampleStatus ? [outboundData.sampleStatus] : []"-->
+<!--                        preview-teleported-->
+<!--                        fit="cover"-->
+<!--                      />-->
+<!--                    </div>-->
+<!--                    <el-link-->
+<!--                      v-else-if="outboundData.sampleStatus"-->
+<!--                      type="primary"-->
+<!--                      :href="outboundData.sampleStatus"-->
+<!--                      :underline="false"-->
+<!--                      target="_blank"-->
+<!--                    >下载</el-link>-->
+<!--                  </div>-->
 
                   </el-descriptions-item>
                 </el-descriptions>

src/views/museums/specimenoutbound/OutboundForm/specimenReturnForm.vue

@@ -60,7 +60,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 
 const formData = ref({
-  id: -1,
+  id: undefined,
   infoId: undefined,
   chineseName: undefined,
   specimenNumber: undefined,

src/views/museums/specimenoutbound/SpecimenOutboundForm.vue

@@ -9,7 +9,7 @@
 
     >
             <div v-if="formData.status === 6 ||  formData.status === 2">
-              <div style="margin-bottom: 20px;color: red;font-size: 20px">
+              <div style="margin-bottom: 20px;margin-left:40px;color: #c54545;font-size: 20px">
                 申请驳回原因：{{formData.processInstanceId}}
               </div>
                   <div style="margin-bottom: 20px;margin-left: 70px;font-size: 18px; font-weight: bold">请重新申请</div>