From 1df77b54dd630a97b8e40578969cdf230b4863f0 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Sat, 11 May 2024 14:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A5=97=E6=96=99=E5=9B=BEPD?=
 =?UTF-8?q?F=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sjzx/jcsj.js     |   8 +++
 src/views/jhzx/sygd.vue  |  19 ++----
 src/views/sjzx/bomwh.vue | 143 +++++++++++++++++++++++----------------
 3 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/src/api/sjzx/jcsj.js b/src/api/sjzx/jcsj.js
index c4eb9b9..e2b4df2 100644
--- a/src/api/sjzx/jcsj.js
+++ b/src/api/sjzx/jcsj.js
@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+export function uploadPDF(data) {
+  return request({
+    url: '/dmBom/uploadPDF',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: data
+  })
+}
 export function getList(data) {return request({url: '/dmCbxxp/getList', method: 'post', data})}
 export function del(data) {return request({url: '/dmCbxxp/del', method: 'post', data})}
 export function edit(data) {return request({url: '/dmCbxxp/edit', method: 'post', data})}
diff --git a/src/views/jhzx/sygd.vue b/src/views/jhzx/sygd.vue
index 9dd82a3..d8cf16a 100644
--- a/src/views/jhzx/sygd.vue
+++ b/src/views/jhzx/sygd.vue
@@ -57,14 +57,9 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {  getYdjhList,generateMx} from '@/api/jhzx/sygd'
-
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
-import { startLoading, endLoading } from '@/utils'
-import { Message } from 'element-ui'
 export default {
   name:'sygd',
   data() {
@@ -283,13 +278,13 @@ export default {
       this.height = window.innerHeight - 150
     },
     sygdPC() {
-      generateMx().then((res) => {
-        console.log(res.data)
-        if (res.success){
-          this.$message.warning('中日程中没有下月信息!')
-        }
-        this.$message.warning('成功!')
-      })
+      // generateMx().then((res) => {
+      //   console.log(res.data)
+      //   if (res.success){
+      //     this.$message.warning('中日程中没有下月信息!')
+      //   }
+      //   this.$message.warning('成功!')
+      // })
     }
   }
 }
diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue
index b702b3e..6e5ce74 100644
--- a/src/views/sjzx/bomwh.vue
+++ b/src/views/sjzx/bomwh.vue
@@ -66,19 +66,22 @@
         </el-row>
         <el-row>
           <el-col :span="5"  :offset="19"  >
-            <el-form-item  style="float: left;margin-left: 13%">
+            <el-form-item  style="float: left;width: 45%;padding-left: 10%">
               <el-upload
-                :action="uploadAction"
+                ref="upload2"
+                action=""
+                :file-list="fileList2"
+                :auto-upload="false"
+                :multiple="true"
+                :on-change="handleChange2"
+                :on-success="sucessChange2"
+                :directory="true"
                 :show-file-list="false"
-                :before-upload="beforeAvatarUploadPDF"
-                :data="filePDFList"
-                :on-success="handleAvatarSuccessPDF"
-                :headers="heads"
               >
-                <el-button type="success" @click="toUploadPDF">导入套料图PDF</el-button>
+                <el-button  type="primary" @click="handleAddFolder2">选择套料图文件夹</el-button>
               </el-upload>
             </el-form-item>
-            <el-form-item style="float: right" >
+            <el-form-item style="float: right;width:45%;padding-left: 10%" >
 <!--              <el-button-->
 <!--                type="success"-->
 <!--                @click="tjClick"-->
@@ -87,12 +90,8 @@
 <!--                type="success"-->
 <!--                @click="bomClick"-->
 <!--              >生成bom</el-button>-->
-
-
               <div style="float: right;" >
-
                 <el-upload
-
                   ref="upload"
                   action=""
                   :file-list="fileList"
@@ -268,6 +267,28 @@
         </div>
       </template>
     </vxe-modal>
+    <vxe-modal v-model="dialogVisible2" width="1200" title="导入文件">
+      <template #default>
+        <el-row class="query_wrapper">
+          <el-row>
+            <el-button style="margin-right: 10px;" size="small" type="success" @click="submitUpload2">上传到服务器</el-button>
+          </el-row>
+        </el-row>
+        <div class="mytable">
+          <vxe-table
+            border
+            show-header-overflow
+            show-overflow
+            height="500px"
+            align="center"
+            :data="tableupload2">
+            <vxe-column type="seq" width="50"></vxe-column>
+            <vxe-column field="tzmc" title="图纸名称" width="300"></vxe-column>
+          </vxe-table>
+
+        </div>
+      </template>
+    </vxe-modal>
   </el-container>
 </template>
 
@@ -276,7 +297,7 @@ import {
   getCzplBase,
   getListBom,
   saveListBom,
-  addListBom, uploadBom,
+  addListBom, uploadBom,uploadPDF
 } from '@/api/sjzx/jcsj'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -307,19 +328,18 @@ export default {
       },
       tableData: [],
       isupload:'02',
-      isuploadPDF:'02',
       filedis:true,
+      filedis2:true,
       uploadData:{
 
-      },
-      uploadPDF:{
-
       },
       tableupload:[],
+      tableupload2:[],
       dialogVisible:false,
+      dialogVisible2:false,
       heads: { token: getToken() },
       fileList: [],
-      filePDFList: {},
+      fileList2: [],
       dictData:{},
       height: '500px',
       bclqList:[],
@@ -327,6 +347,8 @@ export default {
       bctjList:[],
       xctjList:[],
       tltList:[],
+      tltList2:[],
+      tltNameList:[],
       ljList:[],
       title:'',
       czbhu:'',
@@ -978,46 +1000,8 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
-
-
   },
   methods: {
-    // 上传pdf
-    beforeAvatarUploadPDF(file) {
-      console.log(file.name)
-      // 文件类型
-      // const isType = file.type === 'application/vnd.ms-excel'
-      // const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      // const fileType = isType || isTypeComputer
-      var isType = file.name.substring(file.name.lastIndexOf('.') + 1)
-      const fileType = isType === 'pdf'
-      console.log(fileType)
-      if (!fileType) {
-        this.$message.error('上传文件只能是pdf格式！')
-
-        return fileType
-      }
-      startLoading()
-      return fileType
-    },
-    handleAvatarSuccessPDF(res, file) {
-      endLoading()
-      if (res.success) {
-        this.$message({ message: '导入成功', type: 'success' })
-        // this.list = res.data;
-        // this.checkedList = [];
-
-      } else {
-        Message({
-          message: res.message || 'Error',
-          type: 'error',
-          duration: 5 * 1000
-        })
-      }
-    },
-    toUploadPDF() {
-      this.uploadPDF.isupload = this.isuploadPDF
-    },
 
     uploadExcel() {
       // if (this.queryParam.cbbm === '') {
@@ -1046,6 +1030,14 @@ export default {
       //   this.filedis=false
       // }
     },
+    handleAddFolder2 () {
+      this.tableupload2=[],
+        this.$nextTick(() => {
+          this.filedis2=false
+          this.$refs.upload2.$children[0].$refs.input.webkitdirectory = true
+        })
+
+    },
     handleAddFolder () {
 
         // this.fileList=[]
@@ -1073,7 +1065,20 @@ export default {
      uploadpre(name){
 
      },
+    handleChange2(file, fileList) {
+      this.fileList2 = fileList
+      let folderName = file.name;
+      let format = folderName .substring(folderName .lastIndexOf('.') + 1).toLowerCase();
+      if (folderName.includes("数控套料图")&& format==='pdf' &&!this.tltNameList.includes(folderName)) {
+        this.tltNameList.push(folderName)
+        this.tltList2.push(file)
+        let a={tzmc:folderName}
+        this.tableupload2.push(a);
+      }
 
+      // 请求后台 得到需求期
+      this.dialogVisible2=true;
+    },
     handleChange(file, fileList) {
       this.fileList = fileList
       console.log(file)
@@ -1153,6 +1158,31 @@ export default {
       this.fileList = fileList
 
     },
+    sucessChange2(file,fileList){
+      alert(1)
+    },
+    submitUpload2() {
+      //判断是否有文件再上传
+      if (this.fileList2.length === 0) {
+        return this.$message.warning('请选取文件后再上传')
+      }
+      // 判断是否满足条件
+      if(this.tltList2.length ==0){
+        return this.$message.warning('缺少套料图PDF数据')
+      }
+
+      // 下面的代码将创建一个空的FormData对象:
+      const formData = new FormData()
+      this.tltList2.forEach((file) => {
+        formData.append('file', file.raw)
+      })
+      uploadPDF(formData).then(res=>{
+        this.tltNameList=[]
+        this.tableupload2=[]
+        this.dialogVisible2=false;
+        return this.$message.success('上传成功')
+      })
+    },
     sucessChange(file,fileList){
       alert(1)
     },
@@ -1169,7 +1199,6 @@ export default {
       if(this.xclqList.length ==0){
         return this.$message.warning('缺少型材领取数据')
       }
-
       if(this.bctjList.length ==0){
         return this.$message.warning('缺少板材统计数据')
       }