0603电子图纸修改

src/api/business/drawing.js

@@ -36,10 +36,11 @@ export function addDrawing(data) {
 }
 
 // 修改电子图纸
-export function updateDrawing(id) {
+export function updateDrawing(data) {
   return request({
-   url: baseUrl +'/business/drawing/' + id,
+   url: baseUrl +'/business/drawing',
     method: 'put',
+    data: data
   })
 }
 

src/views/business/product/drawingForm.vue

@@ -73,8 +73,10 @@ import {
   updateDrawing,
   drawingByName
 } from "@/api/business/drawing";
+import { addRecords } from '@/api/business/drawingRecords'
 import redcordDialog from './recordsDialog'
 import { getToken } from '@/utils/auth'
+import useUserStore from '@/store/modules/user'
 const webHost = import.meta.env.VITE_APP_BASE_API
 const { proxy } = getCurrentInstance();
 const total = ref(0)
@@ -86,6 +88,8 @@ const openRecords = ref(false)
 const formLoading = ref(false)
 const pdfCover = ref('')
 const dialogVisible = ref(false)
+/**覆盖用对象 */
+const editRow = ref({})
 const pdfUrl = ref('')
 /**不覆盖文件名 */
 const coverName = ref('')
@@ -143,7 +147,6 @@ function handleSelectionChange(selection) {
 
 /** 文件下载 */
 function handleDownload(row) {
-  console.log(webHost + row.url)
 
   return new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
@@ -152,7 +155,6 @@ function handleDownload(row) {
     xhr.upload.onprogress = (e) => {
       if (e.lengthComputable) {
         let progress = e.loaded / e.total;
-        console.log('文件上传进度是', progress);
       }
     };
     xhr.onload = function () {
@@ -164,7 +166,19 @@ function handleDownload(row) {
       document.body.appendChild(eleLink);
       eleLink.click();
       document.body.removeChild(eleLink);
-      resolve('success');
+
+      var recordsItem = {}
+      recordsItem.technologicalProcessDetailId = row.technologicalProcessDetailId;
+      recordsItem.technologicalProcessDetailDrawingId = row.id
+      recordsItem.userId = useUserStore().user.userId
+      recordsItem.type = "下载"
+      recordsItem.drawingName = row.drawingName
+      addRecords(recordsItem).then(res => {
+        if (res.code == 200) {
+          resolve('success');
+        }
+      })
+
     };
     xhr.onerror = (e) => {
       proxy.$modal.msgError('下载文件失败!')
@@ -193,17 +207,22 @@ function handleDelete(id) {
 /**上传成功回调 */
 function handleSuccess(row) {
   form.value.url = row.fileName
-
+  console.log(row.fileName, "上传成功")
   var fileDrawing = {}
   fileDrawing.drawingName = row.originalFilename
   fileDrawing.technologicalProcessDetailId = processDetail.value.id
   drawingByName(fileDrawing).then(res => {
+    // debugger;
     if (res.code == 200) {
+      console.log(res, "数据库查询")
       repeatingDrawings.value = res.data
       if (repeatingDrawings.value.length == 0) {
         coverName.value = row.originalFilename
         saveDrawing();
       } else {
+        /**覆盖对象 */
+        editRow.value = JSON.parse(JSON.stringify(repeatingDrawings.value[0]));
+        editRow.value.url = form.value.url
         //有同名文件，询问是否覆盖
         openRecords.value = true
         coverName.value = row.originalFilename
@@ -214,11 +233,15 @@ function handleSuccess(row) {
 }
 //覆盖保存
 function coverDrawing() {
-  console.log()
-  updateDrawing(repeatingDrawings.value[0].id).then(res => {
+  updateDrawing(editRow.value).then(res => {
     if (res.code == 200) {
-      form.value.type = true
-      saveDrawing();
+      reset();
+      open(processDetail.value)
+      formLoading.value = false
+      openRecords.value = false
+      // form.value.type = true
+      // form.value.drawingName = coverName.value
+      // saveDrawing();
 
     }
   })
@@ -241,7 +264,6 @@ function saveDrawing() {
 function handlePreview(row) {
 
   //  pdfUrl.value = webHost +row.url
-  // console.log(pdfUrl.value )
   dialogVisible.value = true
   pdfCover.value = webHost + row.url
   // window.open((webHost + row.url))
@@ -262,6 +284,7 @@ function beforeUpload(file) {
   const isAllowed = allowedTypes.includes(file.type);
   if (!isAllowed) {
     proxy.$modal.msgError('只能上传 PDF 格式的文件!')
+    return false
   }
 
 }

src/views/business/product/recordsDialog.vue

@@ -8,6 +8,26 @@
         <el-table-column label="行号" type="index" width="50" align="center" />
         <el-table-column label="操作人" prop="userName" align="center" />
         <el-table-column label="操作图纸名称" prop="drawingName" align="center" />
+        <el-table-column label="产品描述"  align="center" >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.productDescription }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工艺版本" prop="type" align="center" >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.technologyVersion }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工序编码" prop="type" align="center"  >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.processCode }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工序简称" prop="type" align="center"  >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.processAlias }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作时间" prop="createTime" align="center" />
         <el-table-column label="操作类型" prop="type" align="center" />
       </el-table>