qinhb 1 gadu atpakaļ
vecāks
revīzija
35ec4e5b2d

+ 4 - 4
src/components/Upload/FilesUpload.vue

@@ -105,9 +105,8 @@ const handleChange = async (uploadFile: UploadFile) => {
   uploadFileApi(uploadFile.raw as File, props.generatePdf)
     .then((res: any) => {
       loading.value = false;
-      let url = props.generatePdf ? res.data.pdfUrl : res.data.fileUrl;
-      src.value = url;
-      pdfList.value.push(url);
+      src.value = res.data.fileUrl;
+      pdfList.value.push(res.data.pdfUrl);
       srcList.value.push(res.data.fileUrl);
       emit("finished");
     })
@@ -121,6 +120,7 @@ const deleteFile = (index: number) => {
   src.value = ""; //删除直接清空src即可,不用考虑是哪个,因为单文件不会有多个
   fileList.value.splice(index, 1);
   srcList.value.splice(index, 1);
+  pdfList.value.splice(index,1)
 };
 
 const PDFVisible = ref(false);
@@ -128,7 +128,7 @@ const pdfSource = ref("");
 const handlePreview = (index: number) => {
   if (srcList.value.length > index && props.generatePdf) {
     pdfSource.value =
-      import.meta.env.VITE_APP_UPLOAD_URL + srcList.value[index];
+      import.meta.env.VITE_APP_UPLOAD_URL + pdfList.value[index];
     PDFVisible.value = true;
   }
 };

+ 27 - 17
src/views/base/information/index.vue

@@ -17,7 +17,13 @@
         @selection-change="selectionChange"
     >
       <template #drawingPath-form="scope">
-        <single-upload v-model="form.drawingPath" :generatePdf="true"/>
+<!--        <single-upload v-model="form.drawingPath" :generatePdf="true"/>-->
+        <FilesUpload
+            v-model:src="fileUrl"
+            v-model:pdf-list="pdfUrlList"
+            :generate-pdf="true"
+            @finished="testFiles"
+        />
       </template>
       <template #enable="scope">
         <el-switch
@@ -37,8 +43,8 @@
             :need-to-show-pdf="true"
             content-type="button"
             :is-link="true"
-            :show-pdf-number="3"
-            pdf-source="http://192.168.101.4:9000/jgfile/2024/04/20/%E7%AC%AC08%E7%AB%A0_%E8%81%9A%E5%90%88%E5%87%BD%E6%95%B0.pdf"
+            :show-pdf-number="1"
+            :pdf-source="filePath + row.pdfPath"
         />
         <el-button @click="deleteRecord(row,index,done)"
                    text
@@ -49,13 +55,6 @@
 
 
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
-    <PDFView
-        :need-to-show-pdf="true"
-        content-type="button"
-        :is-link="true"
-        :show-pdf-number="3"
-        pdf-source="http://192.168.101.4:9000/jgfile/2024/04/20/%E7%AC%AC08%E7%AB%A0_%E8%81%9A%E5%90%88%E5%87%BD%E6%95%B0.pdf"
-    />
   </div>
   <CommonTable
       ref="ctableRef"
@@ -74,7 +73,13 @@ import PDFView from "@/components/PDFView/index.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关
 const { dicts } = useDictionaryStoreHook();
-
+const fileUrl = ref(""); //单文件
+const pdfUrlList = ref([])
+const testFiles =()=>{
+  form.value.pdfPath = pdfUrlList.value[0]
+  form.value.drawingPath = fileUrl.value
+}
+const filePath = import.meta.env.VITE_APP_UPLOAD_URL;
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
@@ -139,17 +144,17 @@ option.value = Object.assign(option.value, {
   delBtn:false,
   menu:true,
   column: [
-    { label: "图纸编号", prop: "drawingCode", width: 140,search: true,overHidden: true ,rules: [{
+    { label: "图纸编号", prop: "drawingCode", width: 180,search: true,overHidden: true ,rules: [{
         required: true,
         message: "请填写图纸编号",
         trigger: "blur"
       }],},
-    { label: "图纸名称", prop: "drawingTitle", width: 130,overHidden: true,search: true ,rules: [{
+    { label: "图纸名称", prop: "drawingTitle", width: 180,overHidden: true,search: true ,rules: [{
         required: true,
         message: "请填写图纸名称",
         trigger: "blur"
       }],},
-    { label: "物料编号", prop: "associationCode", width: 140,search: true,overHidden: true ,editDisplay: false,
+    { label: "物料编号", prop: "associationCode", width: 180,search: true,overHidden: true ,editDisplay: false,
       rules: [{
         required: true,
         message: "请填写物料编号",
@@ -160,7 +165,7 @@ option.value = Object.assign(option.value, {
           ctableRef.value.startSelect();
         }
       }},
-    { label: "物料名称", prop: "associationName", width: 140,search: true,overHidden: true ,disabled:true,rules: [{
+    { label: "物料名称", prop: "associationName", width: 180,search: true,overHidden: true ,disabled:true,rules: [{
         required: true,
         message: "请填写物料名称",
         trigger: "blur"
@@ -186,15 +191,20 @@ option.value = Object.assign(option.value, {
       span: 24,
       slot: true,
       hide:true,
+      rules: [{
+        required: true,
+        message: "请选择文件",
+        trigger: "blur"
+      }],
     },
-    { label: "文件",
+    /*{ label: "文件",
       prop: "drawing",
       type: 'img',
       span: 24,
       display:false,
       slot: true,
       formatter: (row, column, cellValue, index) => {
-        return import.meta.env.VITE_APP_UPLOAD_URL + `${row.drawingPath}`;} },
+        return import.meta.env.VITE_APP_UPLOAD_URL + `${row.drawingPath}`;} },*/
     {
       label: "版本",
       prop: "drawingVersion",