diff --git a/src/api/jhzx/pc.js b/src/api/jhzx/pc.js
index 04d53f8..339eb4d 100644
--- a/src/api/jhzx/pc.js
+++ b/src/api/jhzx/pc.js
@@ -5,3 +5,10 @@ export function 排产(data) {return request({url: '/sygdpc/pc', method: 'get',p
 export function 获取排产结果(data) {return request({url: '/sygdpc/sygdjh', method: 'get',params:data})}
 
 export function 生成三月滚动(data) {return request({url: '/sygdpc/createSygdjh', method: 'get',params:data})}
+export function getCdAll() {return request({url: '/sygdpc/getCdAll', method: 'get'})}
+export function saveGxcd(data) {return request({url: '/sygdpc/saveGxcd', method: 'post', data})}
+export function removeGxcd(data) {return request({url: '/sygdpc/removeGxcd', method: 'post', data})}
+export function getSbcnAll() {return request({url: '/sygdpc/getSbcnAll', method: 'get'})}
+export function saveSbcn(data) {return request({url: '/sygdpc/saveSbcn', method: 'post',data})}
+export function removeSbcn(data) {return request({url: '/sygdpc/remove', method: 'post',data})}
+
diff --git a/src/components/Gcrl/index.vue b/src/components/Gcrl/index.vue
new file mode 100644
index 0000000..4f0b35f
--- /dev/null
+++ b/src/components/Gcrl/index.vue
@@ -0,0 +1,321 @@
+<template>
+  <!-- 工厂日历维护 -->
+  <el-container class="plan-zone">
+    <el-header class="btn-group" style="width: 100%;">
+
+      <div class="right-btn">
+        <el-button-group>
+          <el-button @click="prevMonth" type="primary">上一个月</el-button>
+          <el-button disabled>{{getCurDate() }}</el-button>
+          <el-button @click="nextMonth" type="primary">下一个月</el-button>
+          <el-button type="primary" @click="goToCurrentDay">回到今天</el-button>
+        </el-button-group>
+      </div>
+      <div class="left-btn">
+        <el-button type="primary"  @click="generateNextYear">生成{{nextYear}}年度日历</el-button>
+        <button class="ing" >休息日</button>
+      </div>
+    </el-header>
+    <!-- <el-calendar v-model="value"> </el-calendar> -->
+    <table class="parent-table">
+
+      <thead style="height: 35px;text-align: center">
+      <th>周一</th>
+      <th>周二</th>
+      <th>周三</th>
+      <th>周四</th>
+      <th>周五</th>
+      <th>周六</th>
+      <th>周日</th>
+      </thead>
+      <tbody>
+      <tr v-for="(week, windex) in weeks" :key="windex">
+        <td
+          v-for="(day, dindex) in week"
+          :class="{ highlight: isToday(day.date),highlight2: isRestDay(day.date) }"
+          :key="dindex"
+        >
+          <div
+            class="content"
+            :class="{ faded: !isCurrentMonth(day.date),}"
+          >
+            <div class="top-day">{{ day.date.getDate() }}日</div>
+            <div class="middle-event" v-show="isHidden(day.date)" >
+              <el-button type="primary" @click="changeDay(day.date)"   plain >{{ isRestDay(day.date)?'休息':'工作' }}日</el-button>
+            </div>
+            <div class="bottom-event" >
+            </div>
+
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </el-container>
+
+</template>
+<script>
+import { getList, generate, update } from "@/api/sjzx/gcrlWH";
+export default {
+  data() {
+    return {
+      current: new Date(),
+      today: new Date(),
+      restDays:[],
+      years:[],
+      nextYear:0,
+      flag:false
+    };
+  },
+
+  computed: {
+    weeks() {
+      var month=this.current.getMonth() + 1;
+      var year=this.current.getFullYear();
+      // if (this.current.getDate()>=20){
+      //   month=this.current.getMonth() + 2;
+      //   if (month==1){year=year+1}
+      // }
+      if (!this.years.includes(year+'')&&this.flag){
+        this.$message.warning("请生成"+this.nextYear+"年度工厂日历!");
+      }else {
+        return this.getMonthData(
+          year,
+          month
+        );
+      }
+    },
+  },
+  created() {
+    this.initList();
+  },
+  methods: {
+
+    generateNextYear(){
+      this.years.length-1
+      generate('').then((res) => {
+        if (res.success) {
+          this.$message({ message: "生成成功！", type: "success" });
+          this.initList()
+        }
+      });
+    },
+    // 获取列表接口
+    initList() {
+      getList({}).then((res) => {
+        this.years = res.data.years;
+        this.restDays=res.data.restDays;
+        this.nextYear=res.data.nextYear;
+        this.flag=true
+      });
+    },
+    changeDay(date){
+      var  dateF=this.dateFormat(date);
+      if (this.restDays.includes(dateF)){
+        update({xxr:'1',gl:dateF}).then((res)=>{
+          this.restDays.splice(this.restDays.indexOf(dateF) , 1)
+        })
+      }else {
+        update({xxr:'0',gl:dateF}).then((res)=>{
+          this.restDays.push(dateF)
+        })
+
+      }
+    },
+    isHidden(date){
+      // let today = new Date(Date.UTC(2024, 5, 21));
+      let today = new Date();
+      var lastDay;
+      if (today.getDate()<21){
+        //1.当前为21号前 本月已排好计划 本月最后一天
+       lastDay= new Date(today.getFullYear(), today.getMonth()+1, 1);
+      }else {
+        //2.当前为21号后 下月已排好计划 下月最后一天
+        lastDay= new Date(today.getFullYear(), today.getMonth()+2, 1);
+      }
+      return !(
+        date < lastDay
+      );
+    },
+    getCurDate() {
+      var date = new Date();
+      var year = this.current.getFullYear();
+      var month = this.current.getMonth() + 1; // getMonth() returns a zero-based value (0-11)
+      if (month < 10) {
+        month = "0" + month; // add a leading zero if the month is a single digit
+      }
+      return year + "-" + month;
+    },
+    isToday(date) {
+      let today = new Date();
+      return (
+        date.getDate() === today.getDate() &&
+        date.getMonth() === today.getMonth() &&
+        date.getFullYear() === today.getFullYear()
+      );
+    },
+    isRestDay(date){
+      var  dateF=this.dateFormat(date);
+      return this.restDays.includes(dateF)
+    },
+    goToCurrentDay() {
+      this.current = new Date(this.today);
+    },
+    goToCurrentMonth() {
+      this.current = new Date(this.today);
+    },
+    isCurrentMonth(date) {
+      return date.getMonth() === this.current.getMonth();
+    },
+    prevMonth() {
+      this.current.setMonth(this.current.getMonth() - 1);
+      this.current = new Date(this.current);
+      // console.log(this.current.getFullYear(), 'dedede')
+    },
+    nextMonth() {
+      this.current.setMonth(this.current.getMonth() + 1);
+      this.current = new Date(this.current);
+    },
+    getMonthData(year, month) {
+      let weeks = [];
+      let firstDay = new Date(year, month - 1, 1); // 这个月的第一天
+      let lastDayOfCurrentMonth = new Date(year, month, 0); // 这个月的最后一天
+      let lastDayOfPrevMonth = new Date(year, month - 1, 0); // 上个月的最后一天
+
+      //这里的0有一个特殊的意义，它可以返回上个月的最后一天。也就是说，如果你想知道某个月有多少天，你可以创建一个日期对象，年份和月份设置为你想知道的月份，日期设置为0，然后调用getDate()方法，返回的就是那个月的天数。
+      // new Date(year, month - 1, 0) 最后一个参数，超过当月天数重新排序，比如1月31天，最后一个参数为33返回2
+      let startDayOfWeek = firstDay.getDay() === 0 ? 7 : firstDay.getDay(); // 开始是周几
+      let dayCount = 1; // 当前日期的变量，初始值为1
+      // 上一个月的天数
+      let prevMonthDayCount = lastDayOfPrevMonth.getDate() - startDayOfWeek + 2; // 这是为了在日历中填充上个月的日期。
+      // console.log(lastDayOfPrevMonth.getDate(), startDayOfWeek, prevMonthDayCount)
+      for (let i = 0; i < 6; i++) {
+        let week = [];
+        for (let j = 0; j < 7; j++) {
+          // 日期为上个月的日期，然后将这个日期对象添加到`week`数组中，同时`prevMonthDayCount`加1。
+          if (i === 0 && j < startDayOfWeek - 1) {
+
+            week.push({ date: new Date(year, month - 2, prevMonthDayCount++) });
+            // 日期为下个月的日期，然后将这个日期对象添加到`week`数组中，同时`dayCount`加1
+          } else if (dayCount > lastDayOfCurrentMonth.getDate()) {
+            week.push({
+              date: new Date(
+                year,
+                month,
+                dayCount++ - lastDayOfCurrentMonth.getDate()
+              ),
+            });
+            // 日期为这个月的日期，然后将这个日期对象添加到`week`数组中，同时`dayCount`加1
+          } else {
+            week.push({ date: new Date(year, month - 1, dayCount++) });
+          }
+        }
+        weeks.push(week);
+      }
+      return weeks;
+    },
+    dateFormat(date){
+      const year = date.getFullYear();
+      const month = ('0' + (date.getMonth() + 1)).slice(-2);
+      const day = ('0' + date.getDate()).slice(-2);
+      var dateF=year+'/'+month+'/'+day;
+      return dateF;
+    },
+  },
+};
+
+</script>
+<style lang="scss" scoped>
+.faded {
+  opacity: 0.3;
+}
+.highlight {
+  font-weight: bold;
+  color: red;
+}
+.highlight2 {
+  background: #FFD50074;
+}
+.plan-zone {
+  margin-top: 20px;
+.btn-group {
+  margin-top: 5px;
+  display: flex;
+  justify-content: space-between;
+.left-btn {
+button.ing {
+  background-color: #fff;
+  border: 1px solid #fff;
+  color: #FFD500FF;
+  position: relative;
+  display: block;
+  margin-top:10%;
+  margin-left:40%;
+&::before {
+   content: "";
+   width: 8px;
+   height: 8px;
+   border-radius: 50%;
+   position: absolute;
+   top: 7px;
+   left: -3px;
+   background-color: #FFD500FF;
+
+ }
+}
+}
+.right-btn{
+  display: block;
+}
+}
+}
+.parent-table {
+  border-collapse: collapse;
+  table-layout: fixed;
+  width: 100%;
+  margin-top: 10px;
+th,
+td {
+  width: 14.4%;
+  border: 1px solid #ddd;
+}
+td {
+  padding: 2px 3px;
+
+.content {
+  position: relative;
+  min-height: 100px;
+}
+vertical-align: top;
+.top-day {
+  text-align: left;
+  font-size: 15px;
+}
+.middle-event{
+  text-align:right;
+  margin:3% auto 0px auto;
+}
+.bottom-event{
+  text-align:right;
+  margin:3% auto 0px auto;
+}
+}
+}
+.table-date {
+  display: flex;
+> div {
+  flex: 1;
+}
+}
+</style>
+<style lang="scss" scoped>
+.el-header {
+  margin: 0;
+  padding: 5px 0;
+  height: auto;
+}
+.el-container {
+  padding: 0;
+  margin: 0;
+}
+</style>
diff --git a/src/views/jhzx/components/sygdpc/GxCD.vue b/src/views/jhzx/components/sygdpc/GxCD.vue
new file mode 100644
index 0000000..435569f
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/GxCD.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="mytable">
+    <el-button size="small"  type="primary" @click="getList" >查询</el-button>
+    <el-button size="small"  type="success" @click="add" >新增</el-button>
+    <el-button size="small"  type="danger" @click="remove" >删除</el-button>
+    <el-button size="small"  type="success" @click="saveGxcd" >保存</el-button>
+    <vxe-grid
+      id="gxId"
+      ref="xGridGx"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="gxCDtableColumn"
+      highlight-current-row
+      :data="gxCDList"
+      :custom-config="{storage: true }"
+      :edit-config="{
+                trigger: 'click',
+                mode: 'row',
+                showStatus: true,
+              }"
+      :scroll-x="{enabled: true}"
+      :scroll-y="{enabled: true}"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+import {getCdAll,saveGxcd,removeGxcd} from '@/api/jhzx/pc'
+export default {
+  name:'GxCD',
+  props:{
+    height:{
+      type:Number,
+      default:700,
+    }
+  },
+  data(){
+    return {
+      gxCDList:[],
+      gxCDtableColumn:[
+        { type: 'checkbox', width: 50 },
+        {type: 'seq', width: 60, title: '序号'},
+        { field: 'gx', title: '工序', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cd', title: '间隔周期', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+      ],
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods:{
+    getList(){
+      getCdAll().then((res) => {
+        this.gxCDList = res.data
+      })
+    },
+    add(){
+      this.$refs.xGridGx.insertAt({},-1)
+    },
+    remove(){
+      this.$refs.xGridGx.removeCheckboxRow()
+    },
+    async saveGxcd(){
+      const {insertRecords, removeRecords, updateRecords} = this.$refs.xGridGx.getRecordset()
+      if (insertRecords.length !== 0 ) {
+        await saveGxcd(insertRecords).then(res => {
+          this.getList()
+        })
+      }
+      if (updateRecords.length !== 0) {
+        await saveGxcd(updateRecords).then(res => {
+          this.getList()
+        })
+      }
+      if (removeRecords.length !== 0) {
+        await removeGxcd(removeRecords).then(res => {
+          this.getList()
+        })
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/Sbcn.vue b/src/views/jhzx/components/sygdpc/Sbcn.vue
new file mode 100644
index 0000000..34a90ad
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/Sbcn.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="mytable">
+    <el-button size="small"  type="primary" @click="getList" >查询</el-button>
+    <el-button size="small"  type="success" @click="add" >新增</el-button>
+    <el-button size="small"  type="danger" @click="remove" >删除</el-button>
+    <el-button size="small"  type="success" @click="saveSbcn" >保存</el-button>
+    <vxe-grid
+      id="sbcnId"
+      ref="xGridSbcn"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="sbcnColumn"
+      highlight-current-row
+      :data="sbcnList"
+      :custom-config="{storage: true }"
+      :scroll-x="{enabled: true}"
+      :scroll-y="{enabled: true}"
+      :edit-config="{
+                trigger: 'click',
+                mode: 'row',
+                showStatus: true,
+              }"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+import {getSbcnAll, saveSbcn, removeSbcn} from '@/api/jhzx/pc'
+export default {
+  name:'Sbcn',
+  props:{
+    height:{
+      type:Number,
+      default:700,
+    }
+  },
+  data(){
+    return {
+      sbcnList:[],
+      sbcnColumn:[
+        { type: 'checkbox', width: 50 },
+        {type: 'seq', width: 60, title: '序号', },
+        { field: '_工序', title: '工序', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'code', title: '编码', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '设备名称', title: '设备名称', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '单台效率', title: '单台效率', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '单台产能', title: '单台产能', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '白班设备产能', title: '白班设备产能', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '二班设备产能', title: '二班设备产能', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '双班合计产能', title: '双班合计产能', width: 150,
+          editRender: { name: "input" },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '禁用', title: '禁用', width: 150,
+          editRender: {  name: '$select', options:[{ label: '是', value:true}, { label: '否', value:false}], props: {clearable: true}},
+          formatter:this.formatterJy,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+      ],
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods:{
+    getList(){
+      getSbcnAll().then((res) => {
+        this.sbcnList = res.data
+      })
+    },
+    add(){
+      this.$refs.xGridSbcn.insertAt({},-1)
+    },
+    remove(){
+      this.$refs.xGridSbcn.removeCheckboxRow()
+    },
+    async saveSbcn(){
+      const {insertRecords, removeRecords, updateRecords} = this.$refs.xGridSbcn.getRecordset()
+      if (insertRecords.length !== 0 ) {
+        await saveSbcn(insertRecords).then(res => {
+          this.getList()
+        })
+      }
+      if (updateRecords.length !== 0) {
+        await saveSbcn(updateRecords).then(res => {
+          this.getList()
+        })
+      }
+      if (removeRecords.length !== 0) {
+        await removeSbcn(removeRecords).then(res => {
+          this.getList()
+        })
+      }
+    },
+    //转码
+    formatterJy({cellValue}){
+      if(cellValue){
+        return '是'
+      }
+      if(!cellValue){
+        return '否'
+      }
+      return cellValue
+    },
+
+  }
+}
+</script>
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index 9c8e78c..568269f 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -53,7 +53,7 @@
           </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="jgcx">读取三月滚动</el-button>
               <el-button type="success" @click="symxhz">汇总</el-button>
               <vxe-grid
@@ -288,6 +288,36 @@
         </div>
       </template>
     </vxe-modal>
+    <!-- 弹出层——展示待确认项-->
+    <vxe-modal v-model="dialogVisible2" width="80%" :title="title2">
+      <template #default>
+        <el-row class="query_wrapper">
+          <el-row style="float: right;margin-right: 5px;">
+            <el-button size="small"  type="success" v-show="modalShow>1" @click="preModal" plain>上一步</el-button>
+            <el-button size="small"  type="success" v-show="modalShow<5" @click="nextModal" plain>下一步</el-button>
+            <el-button size="small"  type="success" v-show="modalShow==5"@click="paichan" plain>完成</el-button>
+          </el-row>
+        </el-row>
+        <el-row>
+          <hr/>
+          <div v-show="modalShow==1">
+            <Gcrl/>
+          </div>
+          <div v-show="modalShow==2">
+            <GxCD/>
+          </div>
+          <div v-show="modalShow==3">
+            <Sbcnwh/>
+          </div>
+          <div v-show="modalShow==4">
+            <Sbwxjh/>
+          </div>
+          <div v-show="modalShow==5">
+            <Sbjgry/>
+          </div>
+        </el-row>
+      </template>
+    </vxe-modal>
   </el-container>
 </template>
 <script>
@@ -305,18 +335,25 @@ import XEUtils from 'xe-utils'
 import {getToken} from '@/utils/auth'
 import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
 import {排产, 生成三月滚动, 获取排产结果,} from "@/api/jhzx/pc";
-
+import Gcrl from '@/components/Gcrl';
+import Sbcnwh from '@/views/jhzx/components/sygdpc/Sbcn.vue';
+import Sbwxjh from '@/views/sjzx/sbwxjhWH.vue';
+import Sbjgry from '@/views/sjzx/sbjgryWH.vue';
+import GxCD from '@/views/jhzx/components/sygdpc/GxCD.vue';
 export default {
   name: 'SymxCX',
-  components: {ScrollPane},
+  components: {ScrollPane,Gcrl,Sbcnwh,Sbwxjh,Sbjgry,GxCD},
   data() {
     return {
       isUser:false,
       gcrl:[],
       dialogVisible: false,
       dialogVisible1: false,
+      dialogVisible2: false,
       title: '选择目标船只',
       title1: '修改明细信息',
+      title2: '修改工厂日历(1/5)',
+      modalShow:1,
       selectMbch: [],
       mxList: [],
       haveTltBoms: [],
@@ -2717,6 +2754,12 @@ export default {
       if (newValue){
         this.format(newValue);
       }
+    },
+    'dialogVisible2'(newValue, Value){
+      if (!newValue){
+        this.modalShow=1
+        this.title2="修改工厂日历(1/5)"
+      }
     }
   },
   methods: {
@@ -2930,19 +2973,50 @@ export default {
       this.height = window.innerHeight - 200
     },
     paichan(){
-      const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
-      排产(data).then((res)=>{
-        if (res.success){
-          this.jgcx(false)
-          生成三月滚动(data).then(res=>{
-            this.list=res.data
-            this.initList()
-          })
-        }else{
-          this.jgcx(false)
-          this.$message.warning(res.message)
-        }
-      })
+        this.dialogVisible2=false
+        const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
+        排产(data).then((res)=>{
+          if (res.success){
+            this.jgcx(false)
+            生成三月滚动(data).then(res=>{
+              this.list=res.data
+              this.initList()
+            })
+          }else{
+            this.jgcx(false)
+            this.$message.warning(res.message)
+          }
+        })
+
+    },
+    confirmModal(){
+      this.dialogVisible2 = true
+
+    },
+    nextModal(){
+      this.modalShow=this.modalShow+1
+      this.changeTitle2()
+    },
+    preModal(){
+      this.modalShow=this.modalShow-1
+      this.changeTitle2()
+    },
+    changeTitle2(){
+      if (this.modalShow==1){
+        this.title2='修改工厂日历(1/5)'
+      }
+      if (this.modalShow==2){
+        this.title2='工序间隔周期(2/5)'
+      }
+      if (this.modalShow==3){
+        this.title2='修改设备产能(3/5)'
+      }
+      if (this.modalShow==4){
+        this.title2='设备维护/维修(4/5)'
+      }
+      if (this.modalShow==5){
+        this.title2='人员出勤情况(5/5)'
+      }
     },
     jgcx(flag=true){
       const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
diff --git a/src/views/sjzx/gcrlWH.vue b/src/views/sjzx/gcrlWH.vue
index fbba75e..69b1bf7 100644
--- a/src/views/sjzx/gcrlWH.vue
+++ b/src/views/sjzx/gcrlWH.vue
@@ -1,289 +1,20 @@
 <template>
   <!-- 工厂日历维护 -->
-  <el-container>
-    <el-header style="width: 100%">
-      <el-form ref="requestForm" :model="request" label-width="45px">
-        <el-row>
-          <el-col :span="4">
-            <el-form-item label="年份:">
-              <el-input v-model="request.nf" placeholder="年份" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="20" style="text-align: right">
-            <el-button
-              type="success"
-              @click="toolbarButtonClickEvent('generate')"
-              >一键生成</el-button
-            >
-            <el-button type="primary" @click="initList()">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24" style="text-align: right">
-            <el-button type="primary" @click="toolbarButtonClickEvent('save')"
-              >保存</el-button
-            >
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-header>
-    <el-container style="padding-top: 10px">
-      <el-container>
-        <el-main>
-          <div class="mytable">
-            <vxe-grid
-              id="id"
-              ref="tableRef"
-              border
-              resizable
-              keep-source
-              :height="height"
-              :auto-resize="true"
-              :columns="tableColumn"
-              :data="list"
-              :custom-config="{ storage: true }"
-              :scroll-y="{ enabled: true }"
-              :edit-config="{
-                trigger: 'click',
-                mode: 'row',
-                showStatus: true,
-              }"
-              highlight-hover-row
-            >
-            </vxe-grid>
-          </div>
-        </el-main>
-      </el-container>
-    </el-container>
-  </el-container>
-</template>
+  <Gcrl/>
 
+</template>
 <script>
-import { getList, generate, update } from "@/api/sjzx/gcrlWH";
-import { mapGetters } from "vuex";
+import Gcrl from '@/components/Gcrl'
 export default {
-  name: "gcrlWH",
+  name: "GcrlWH",
   data() {
     return {
-      request: {
-        nf: "",
-      },
-      list: [],
-      height: "500px",
-      tableColumn: [
-        { type: "seq", width: "50", title: "序号", align: "center" },
-        {
-          field: "gzlr",
-          title: "工作日历",
-          align: "center",
-        },
-        {
-          field: "gl",
-          title: "公历",
-          align: "center",
-        },
-        {
-          field: "xq",
-          title: "星期",
-          align: "center",
-        },
-        // {
-        //   field: "yz",
-        //   title: "月周",
-        //   align: "center",
-        // },
-        {
-          field: "nz",
-          title: "年周",
-          align: "center",
-        },
-        {
-          field: "nf",
-          title: "年份",
-          align: "center",
-        },
-        {
-          field: "xxr",
-          title: "类型",
-          align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
-        },
-        {
-          field: "bz",
-          title: "备注",
-          align: "center",
-          editRender: { name: "input" },
-        },
-        {
-          field: "pb",
-          title: "排班",
-          align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true },
-          },
-        },
-      ],
-      typeOption: [
-        {
-          value: "0",
-          label: "休息日",
-        },
-        {
-          value: "1",
-          label: "工作日",
-        },
-      ],
-      pbOption: [
-        {
-          value: "1",
-          label: "早班",
-        },
-        {
-          value: "2",
-          label: "晚班",
-        },
-        {
-          value: "3",
-          label: "双班",
-        },
-      ],
     };
   },
-  computed: {
-    ...mapGetters(["name", "bmbm"]),
-  },
-  created() {
-    window.addEventListener("resize", this.getHeight);
-    this.getHeight();
-    var date=new Date;
-    var year=date.getFullYear();
-    this.request.nf = year;
-    this.typeList();
-    this.initList();
-
-  },
-  methods: {
-    typeList() {
-      this.$nextTick(() => {
-        const tableRef = this.$refs.tableRef;
-        const typeText = tableRef.getColumnByField("xxr");
-        const pbText = tableRef.getColumnByField("pb");
-        typeText.editRender.options = this.typeOption;
-        pbText.editRender.options = this.pbOption;
-
-      });
-    },
-    // 获取列表接口
-    initList() {
-      getList(this.request).then((res) => {
-        this.list = res.data;
-      });
-    },
-    // 操作
-    async toolbarButtonClickEvent(code) {
-      const { updateRecords } = this.$refs.tableRef.getRecordset();
-      switch (code) {
-        case "generate":
-          generate(this.request.nf).then((res) => {
-            if (res.success) {
-              const xTable = this.$refs.tableRef;
-              xTable.loadData(this.initList());
-              this.$message({ message: "生成成功！", type: "success" });
-            }
-          });
-          break;
-        case "save":
-          const valid = this.$refs.tableRef;
-          if (valid) {
-            const errMap = await valid.validate(true);
-            if (errMap) {
-              return false;
-            } else {
-              //  修改
-              if (updateRecords.length !== 0) {
-                this.$confirm("是否确认保存选中的数据?", "提示", {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                })
-                  .then(() => {
-                    update(updateRecords).then((res) => {
-                      if (res.success) {
-                        const xTable = this.$refs.tableRef;
-                        xTable.loadData(this.initList());
-                        this.$message({
-                          message: "保存成功！",
-                          type: "success",
-                        });
-                      }
-                    });
-                  })
-                  .catch(() => {});
-              }
-            }
-          }
-          break;
-      }
-    },
-    getHeight() {
-      this.height = window.innerHeight - 160;
-    },
+  components: {
+    Gcrl
   },
+  methods: {},
 };
+
 </script>
-<style lang="scss" scoped>
-.el-header {
-  margin: 0;
-  padding: 5px 0;
-  height: auto;
-}
-.el-container {
-  padding: 0;
-  margin: 0;
-}
-.el-main {
-  padding: 0;
-}
-.el-col {
-  padding: 0;
-}
-.el-aside {
-  background: #fff;
-  padding: 0;
-}
-.el-container {
-  padding: 0;
-}
-.el-row {
-  margin-bottom: 5px;
-}
-.el-row:last-child {
-  margin-bottom: 0;
-}
-.tableStyles {
-  background: #0a76a4;
-}
-.my-dropdown {
-  width: 450px;
-  height: 250px;
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
-  font-size: 12px;
-}
-::v-deep .mytable .vxe-input {
-  display: flex !important;
-}
-::v-deep .el-form-item {
-  margin-bottom: 0px !important;
-}
-::v-deep .el-input {
-  width: auto !important;
-}
-</style>
diff --git a/src/views/sjzx/sbjgryWH.vue b/src/views/sjzx/sbjgryWH.vue
index f604235..db744b1 100644
--- a/src/views/sjzx/sbjgryWH.vue
+++ b/src/views/sjzx/sbjgryWH.vue
@@ -19,10 +19,9 @@
           <el-col :span="4">
           </el-col>
           <el-col :span="16" style="text-align: right">
-            <el-button type="success" @click="toolbarButtonClickEvent('insert')"
-              >添加</el-button
-            >
             <el-button type="primary" @click="initList()">查询</el-button>
+            <el-button type="success" @click="toolbarButtonClickEvent('insert')">添加</el-button>
+
           </el-col>
         </el-row>
         <el-row>
@@ -241,7 +240,6 @@ export default {
         },
   ],
       gxOptions: [],
-
       departmentOptions: [],
       options: [],
       sbmcOptions: [],
@@ -505,7 +503,7 @@ export default {
       }
     },
     getHeight() {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 180;
     },
   },
 };
diff --git a/src/views/sjzx/sbwxjhWH.vue b/src/views/sjzx/sbwxjhWH.vue
index a01d38d..63b125b 100644
--- a/src/views/sjzx/sbwxjhWH.vue
+++ b/src/views/sjzx/sbwxjhWH.vue
@@ -30,10 +30,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="16" style="text-align: right">
-            <el-button type="success" @click="toolbarButtonClickEvent('insert')"
-              >添加</el-button
-            >
             <el-button type="primary" @click="initList()">查询</el-button>
+            <el-button type="success" @click="toolbarButtonClickEvent('insert')">添加</el-button>
+
           </el-col>
         </el-row>
         <el-row>
@@ -684,7 +683,7 @@ export default {
       }
     },
     getHeight() {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 180;
     },
   },
 };
diff --git a/src/views/sjzx/sbxxWH1.vue b/src/views/sjzx/sbxxWH1.vue
index d14ef12..e308427 100644
--- a/src/views/sjzx/sbxxWH1.vue
+++ b/src/views/sjzx/sbxxWH1.vue
@@ -751,7 +751,7 @@ export default {
       }
     },
     getHeight() {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 180;
     },
   },
 };