1.删除导入项

2.增加月度计划导入时支持导入已下发月度计划
3.月度计划审核时自动生成作业计划,作业计划不再根据双周需求导入时生成

src/views/jhzx/sygdSH.vue

@@ -74,19 +74,17 @@
               border
               resizable
               keep-source
-              show-overflow
               :align="'center'"
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
+              highlight-current-row
               :data="list"
               :custom-config="{ storage: true }"
-              highlight-current-row
+              :scroll-y="{enabled: true}"
               highlight-hover-row
-              :span-method="rowspanMethod"
-              @checkbox-all="selectAllEvent"
-              @checkbox-change="selectChangeEvent"
-              :scroll-y="{ enabled: true }"
+              show-overflow
+              show-header-overflow
             >
             </vxe-grid>
           </div>
@@ -98,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList, sh, tj} from '@/api/jhzx/sygd'
+import {getList, getSygdList, sh, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -432,7 +430,7 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getSygdList(this.queryParam).then((res) => {
+      getList(this.queryParam).then((res) => {
         this.list = res.data.list
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)

src/views/jhzx/sygdWH.vue

@@ -74,19 +74,17 @@
               border
               resizable
               keep-source
-              show-overflow
               :align="'center'"
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
+              highlight-current-row
               :data="list"
               :custom-config="{ storage: true }"
-              highlight-current-row
+              :scroll-y="{enabled: true}"
               highlight-hover-row
-              :span-method="rowspanMethod"
-              @checkbox-all="selectAllEvent"
-              @checkbox-change="selectChangeEvent"
-              :scroll-y="{ enabled: true }"
+              show-overflow
+              show-header-overflow
             >
             </vxe-grid>
           </div>
@@ -98,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList,tj} from '@/api/jhzx/sygd'
+import {getList, getSygdList, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'

src/views/jhzx/symxCX.vue

@@ -3094,7 +3094,6 @@ export default {
       const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
       生成月度计划(data).then(res=>{
         this.list=res.data
-        this.initList()
       })
     },
     paichan(){