Merge branch 'js_dev' of http://113.44.0.55:8014/jiaxiaoqiang/JG-ADMIN-TEMP into js_dev

src/components/Upload/FilesUpload.vue

@@ -32,25 +32,13 @@
       </el-tag>
     </div>
   </el-upload>
-  <el-drawer
-    v-model="PDFVisible"
-    :footer="false"
-    :header="false"
-    :show-close="false"
-    destroy-on-close
-    direction="rtl"
-    :append-to-body="true"
-    size="972px"
-  >
-    <VuePdfEmbed :source="pdfSource" annotation-layer text-layer />
-  </el-drawer>
+  <PDFDrawerView ref="PDFDrawerViewRef"></PDFDrawerView>
 </template>
 <script lang="ts" setup>
 import { ref } from "vue";
 import { UploadFile, UploadFiles, UploadUserFile } from "element-plus";
 import { uploadFileApi } from "@/api/file";
 import PDFView from "@/components/PDFView/index.vue";
-import VuePdfEmbed from "vue-pdf-embed";
 
 const props = defineProps({
   size: {
@@ -135,15 +123,17 @@ const deleteFile = (index: number) => {
   fileNameList.value.splice(index, 1);
 };
 
-const PDFVisible = ref(false);
-const pdfSource = ref("");
 const handlePreview = (index: number) => {
   if (srcList.value.length > index && props.generatePdf) {
-    pdfSource.value =
-      import.meta.env.VITE_APP_UPLOAD_URL + pdfList.value[index];
-    PDFVisible.value = true;
+    let url = import.meta.env.VITE_APP_UPLOAD_URL + pdfList.value[index];
+    toShowPDF(url);
   }
 };
+
+const PDFDrawerViewRef = ref(null);
+const toShowPDF = (url) => {
+  PDFDrawerViewRef.value && PDFDrawerViewRef.value.showPdf(url);
+};
 </script>
 
 <style scoped lang="scss">

src/views/base/information/index.vue

@@ -44,11 +44,10 @@
         <el-button link type="primary" @click="toShowPDF(row)">
           预览
         </el-button>
-        <el-button
-          @click="deleteRecord(row, index, done)"
-          text
-          icon="el-icon-delete"
-          type="primary"
+        <el-button @click="doEdit(row, index)" text type="primary"
+          >编辑</el-button
+        >
+        <el-button @click="deleteRecord(row, index, done)" text type="danger"
           >删除</el-button
         >
       </template>
@@ -347,6 +346,13 @@ option.value = Object.assign(option.value, {
   ],
 });
 
+const doEdit = (row, index) => {
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+  crudRef.value && crudRef.value.rowEdit(row, index);
+};
+
 const deleteRecord = (row, index, done) => {
   deleteRow(row, index, done);
   dataEditList();