1.111

src/api/jhzx/pc.js

@@ -4,7 +4,7 @@ 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 生成月度计划(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})}

src/api/jhzx/sygd.js

@@ -12,7 +12,7 @@ export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'po
 export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})}
 export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})}
 export function tjydjh(data) {return request({url: '/dmYdjh/tj', method: 'post', data})}
-export function hz(data) {return request({url: '/dmYdjh/hz', method: 'post', data})}
+export function hz(data) {return request({url: '/dmYdjh/hz', method: 'post', params:data})}
 export function ydjhxf(data) {return request({url: '/dmYdjh/xf', method: 'post', data})}
 
 //采购计划到货情况

src/views/jhzx/qfxqSH.vue

@@ -77,14 +77,10 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
+              :scroll-y="{enabled: true}"
             >
-
-
             </vxe-grid>
           </div>
-
-
         </el-main>
       </el-container>
     </el-container>

src/views/jhzx/symxCX.vue

@@ -62,7 +62,7 @@
           <el-tab-pane label="前方三月需求计划" name="first">
             <div class="mytable">
               <el-button type="success" @click="confirmModal">月度计划排产</el-button>
-              <el-button type="success" @click="jgcx">生成月度计划</el-button>
+              <el-button type="success" @click="creatYdjh">生成月度计划</el-button>
               <el-button type="success" @click="symxhz">汇总</el-button>
               <vxe-grid
                 id="id"

src/views/jhzx/ydjhzxCX.vue

@@ -49,6 +49,7 @@
               highlight-current-row
               highlight-hover-row
               show-overflow
+              :scroll-y="{enabled: true}"
             >
             </vxe-grid>
           </div>

src/views/jhzx/ydjhzxGL.vue

@@ -956,7 +956,11 @@ export default {
         this.$message.warning('请先查询需要汇总的信息！');
         return
       }
-      hz(this.list).then((res) => {
+      const data={
+        from:this.queryParam.yf,
+        to:XEUtils.toDateString(XEUtils.getWhatMonth(this.queryParam.yf,0,'last'),'yyyy/MM/dd')
+      }
+      hz(data).then((res) => {
         if (res.data) {
           this.list2=res.data.tzjhList
           this.list3=res.data.dhList

src/views/jhzx/ydjhzxXF.vue

@@ -995,6 +995,7 @@ export default {
           return;
         }
       }
+      console.log(this.queryParam)
       ydjhxf(this.checkedList).then(res => {
         if (res.success) {
           this.initList()

src/views/jhzxgl/components/YppTq.vue

@@ -103,6 +103,7 @@ export default {
         fan:'1'
       },
       projectData:[],
+      projectData1:[],
       monthList:[],
       list: [],
       checkedList: [],
@@ -241,6 +242,7 @@ export default {
     initProject(){
       getCzplBase({}).then(res=>{
         this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
       })
     },
     cellClickEvent({row}){

src/views/jhzxgl/yppGL.vue

@@ -11,7 +11,7 @@
                     v-model="request.dcCh"
                     placeholder="船号"
                     style="height: 28px;
-                    line-height: 28px; width: 150px;"
+                    line-height: 28px; width: 140px;"
                     suffix-icon="vxe-icon--search"
                     @keyup="keyupEvent4"
                     @focus="focusEvent4"
@@ -22,6 +22,7 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
+
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"
@@ -157,6 +158,7 @@ export default {
       dwList:[],
       bfwzList:[],
       projectData:[],
+      projectData1:[],
       request:{
         dcCh:'',
         dwh:'',
@@ -373,6 +375,7 @@ export default {
     initProject(){
       getCzplBase({}).then(res=>{
         this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
       })
     },
     cellClickEvent({row}){
@@ -383,7 +386,9 @@ export default {
       this.$refs.xDown4.showPanel()
     },
     keyupEvent4(){
+      console.log(this.request.dcCh)
       if (this.request.dcCh) {
+        console.log(this.request.dcCh)
         this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)

src/views/sjzx/bzzzgl.vue

@@ -2,17 +2,6 @@
   <el-container style="height: 100%;position: absolute;width: 100%;">
     <el-col :span="16" style="height:100%;">
       <div style="color:#909399;font-size: 12px;height: 9%">
-        所属公司：
-        <el-select v-model="query.companyName" clearable placeholder="所属公司" style="width: 100px">
-          <el-option
-            v-for="item in dm_depart"
-            :key="item.depart_code"
-            :label="item.depart_name"
-            :value="item.depart_code"
-          />
-        </el-select>
-        班组编码：
-        <el-input v-model="query.resourcesCode" placeholder="班组编码" style="width: 100px" clearable />
         班组名称：
         <el-input v-model="query.resourcesName" placeholder="班组名称" style="width: 100px" clearable />
         班组分类：
@@ -46,7 +35,7 @@
         ref="bzxxTable"
         :show-overflow-tooltip="true"
         :data="c_yhxxTableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
-        height="calc(100% - 60px - 35px)"
+        height="calc(100% - 80px - 35px)"
         :header-cell-style="{ textAlign: 'center' }"
         :cell-style="{ textAlign: 'center' }"
         width="100%"
@@ -63,24 +52,17 @@
         <el-table-column  label="序号" type="index" />
         <el-table-column  label="班组编码" property="resourcesCode" />
         <el-table-column  label="班组名称" property="resourcesName" />
-        <el-table-column  label="是否资源" property="resource" />
-        <el-table-column  label="所属工厂" property="factoryName" />
-        <el-table-column  label="所属车间" property="workshopName" />
           <el-table-column  label="所属跨位" width="100px">
             <template slot-scope="scope">
               {{ getKwName(scope.row.kw) }}
             </template>
           </el-table-column>
-        <el-table-column  label="所属产线" property="productionLineName" />
-        <el-table-column  label="组织类型" property="resourcesType" />
-        <el-table-column  label="外部对照码" property="comparisonCode" />
-        <el-table-column  label="班组分类" property="classification" />
         <el-table-column  label="状态" property="flagStatus" />
-<!--        <el-table-column  label="操作"  fixed="right">-->
+        <el-table-column  label="操作"  fixed="right">
-<!--          <template slot-scope="scope">-->
+          <template #default="{row}">
-<!--            <el-button @click="handleDeleteYhxx2" type="text" size="small" style="text-align: center;color: red">删除</el-button>-->
+            <el-button @click="(event)=>bzPersonAdd(event,row)" type="text" style="text-align: center;color: blue">编辑</el-button>
-<!--          </template>-->
+          </template>
-<!--        </el-table-column>-->
+        </el-table-column>
       </el-table>
       <el-pagination
         :current-page="currentPage"
@@ -177,7 +159,7 @@
         class="bzryTable"
         :show-overflow-tooltip="true"
         :data="bzryTableData"
-        height="calc(100% - 30px - 35px)"
+        height="calc(100% - 80px - 35px)"
         width="100%"
         :border="true"
         highlight-current-row
@@ -199,6 +181,23 @@
       </el-table>
     </el-col>
     <tbfilter ref="tbFilter" :list="c_yhxxTableData" :filter="columnFilter" @execFilter="execFilter" />
+    <el-dialog class="YhxxDialog" title="增加人员" :visible.sync="addPersonVisible" width="450px" center="">
+      <el-row>
+        <el-row>
+          <span style="width: 110px;display:inline-block;">所属班组：</span>
+          <el-input v-model="selectedPerson.resourcesCode"  style="width: 250px;display: none" />
+          <el-input v-model="selectedPerson.resourcesName" disabled placeholder="" style="width: 250px;" />
+        </el-row>
+        <el-row>
+          <span style="width: 110px;display:inline-block;">人员编码：</span>
+          <el-input v-model="selectedPerson.userCode" placeholder="" style="width: 250px;" />
+        </el-row>
+        <el-row>
+          <span style="width: 110px;display:inline-block;">人员姓名：</span>
+          <el-input v-model="selectedPerson.userName" placeholder="" style="width: 250px;" />
+        </el-row>
+      </el-row>
+    </el-dialog>
   </el-container>
 
 </template>
@@ -222,6 +221,8 @@ export default {
   components: { tbfilter },
   data() {
     return {
+      selectedPerson:{},
+      addPersonVisible:false,
       defaultHeight: {
         height: '100%'
       },
@@ -291,6 +292,11 @@ export default {
     })
   },
   methods: {
+    bzPersonAdd(e,row){
+      this.selectedPerson=row
+      this.addPersonVisible=true
+      e.preventDefault()
+    },
     showFilter(column) {
       this.$refs.tbFilter.showFilter(column)
     },
@@ -299,7 +305,7 @@ export default {
       this.$set(this.columnFilter, property, vals)
     },
     getHeight() {
-      this.defaultHeight.height = window.innerHeight - 140 + 'px'
+      this.defaultHeight.height = window.innerHeight - 170 + 'px'
     },
     handleSizeChange(val) {
       this.pageSize = val