1.增加中日程和批量表合并导入功能

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="paichan">月度计划排产</el-button>-->
-<!--              <el-button type="success" @click="confirmModal">月度计划排产</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

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'