From 8420f3d9c9fb59be0592ecc8b17ce546887b93ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 10 Oct 2024 17:26:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=92=8C=E6=89=B9=E9=87=8F=E8=A1=A8=E5=90=88=E5=B9=B6=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/jhzx/symxCX.vue | 4 ++--
src/views/jhzx/zrcWH.vue | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index 2ce9967..e796ee7 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -61,8 +61,8 @@
</el-tab-pane>
<el-tab-pane label="月度计划编制" name="first">
<div class="mytable">
- <el-button type="success" @click="paichan">月度计划排产</el-button>
-<!-- <el-button type="success" @click="confirmModal">月度计划排产</el-button>-->
+<!-- <el-button type="success" @click="paichan">月度计划排产</el-button>-->
+ <el-button type="success" @click="confirmModal">月度计划排产</el-button>
<el-button type="success" @click="creatYdjh">生成月度计划</el-button>
<el-button type="success" @click="symxhz">汇总</el-button>
<vxe-grid
diff --git a/src/views/jhzx/zrcWH.vue b/src/views/jhzx/zrcWH.vue
index d665c61..fe92d49 100644
--- a/src/views/jhzx/zrcWH.vue
+++ b/src/views/jhzx/zrcWH.vue
@@ -152,7 +152,7 @@ export default {
},
isupload:'02',
heads: { token: getToken() },
- uploadAction: process.env.VUE_APP_BASE_API + '/dmZrcjh/upload',
+ uploadAction: process.env.VUE_APP_BASE_API + '/zrcAndPlb/upload',
list: [],
height: "500px",
tableColumn: [
@@ -926,6 +926,12 @@ 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'