From 0fce8cfc3a9a3ab261b48d20cff71f7d66f72076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 15 Oct 2024 10:59:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B8=85=E7=90=86=E6=97=A0=E6=95=88=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E9=A1=B9=202.=E4=BF=AE=E5=A4=8D=E9=98=85=E8=AF=BB?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84bug=203.=E5=A2=9E=E5=8A=A0ws=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E8=B0=83=E8=AF=95=E7=8E=AF=E5=A2=83=204.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ws=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzx/ydjhzxGL.vue | 42 -------------------------------------
 src/views/jhzx/zrcWH.vue    | 15 ++++++++-----
 2 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 80d3def..e8bcde1 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -708,48 +708,6 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-        {
-          field: 'hxjhrq',
-          title: '划线计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjhrq',
-          title: '切割计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'zcljhrq',
-          title: '再处理计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'sljhrq',
-          title: '上料计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'pwjhrq',
-          title: '抛丸计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'lljhrq',
-          title: '理料计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        }
       ],
     }
   },
diff --git a/src/views/jhzx/zrcWH.vue b/src/views/jhzx/zrcWH.vue
index fe92d49..0ddfdac 100644
--- a/src/views/jhzx/zrcWH.vue
+++ b/src/views/jhzx/zrcWH.vue
@@ -145,6 +145,9 @@ export default {
   name: "zrcWH",
   data() {
     return {
+      uploadData:{
+        isupload:null,
+      },
       request: {
         date: "",
         Zt: "0",
@@ -153,6 +156,7 @@ export default {
       isupload:'02',
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/zrcAndPlb/upload',
+      tmpUploadAction:null,
       list: [],
       height: "500px",
       tableColumn: [
@@ -168,7 +172,7 @@ export default {
           field: "dcCh",
           title: "船号",
           align: "center",
-          minWidth: "70",
+          width: "90",
           filters: [
             {
               data: {
@@ -852,7 +856,7 @@ export default {
           label: "审核",
         },
       ],
-      fileList: [],
+      fileList: {},
       checkedList: [],
       ShipNoList: [], //船号
       projectData:[],
@@ -868,6 +872,7 @@ export default {
     };
   },
   created() {
+    this.tmpUploadAction=this.uploadAction
     window.addEventListener("resize", this.getHeight);
     this.getHeight();
     // this.initList();
@@ -917,7 +922,7 @@ export default {
     },
     keyupEvent4() {
       if (this.request.dcCh) {
-        this.projectData = this.projectData1.filter(row => row.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)
       }
@@ -925,13 +930,11 @@ export default {
     },
     // 上传excel
     beforeAvatarUpload(file) {
-
       if (!this.request.dcCh){
         this.$message.error('请选择船号')
         return false
       }
 
-      this.uploadAction+= `?dcCh=${this.request.dcCh}`
       // 文件类型
       const isType = file.type === 'application/vnd.ms-excel'
       const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
@@ -945,6 +948,7 @@ export default {
     },
     handleAvatarSuccess(res, file) {
       endLoading()
+
       if (res.success) {
         this.$message({ message: '导入成功', type: 'success' })
         this.list = res.data;
@@ -960,6 +964,7 @@ export default {
     },
     uploadExcel() {
       this.uploadData.isupload = this.isupload
+      this.uploadAction=`${this.tmpUploadAction}?dcCh=${this.request.dcCh}`
     },
     // 全选
     selectAllEvent() {