1.优化预配盘摆放

src/views/jhzxgl/yppyz.vue

@@ -162,7 +162,7 @@ export default {
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'zl',ormatter: ['dictFormat', 'ZLLB'],
+          field: 'zl',formatter: ['dictFormat', 'ZLLB'],
           title: '组立',editRender: { name: '$select',options: [], props: {clearable: true} },
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -240,16 +240,16 @@ export default {
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
-        const select=this.$refs.xGrid.getColumnByField('dcCh')
-        const chList=[]
-        res.data.cbbm.forEach(item=>{
-          const data={
-            label:item.cbbm,
-            value:item.cbbm
-          }
-          chList.push(data)
-        })
-        select.editRender.options=chList
+        // const select=this.$refs.xGrid.getColumnByField('dcCh')
+        // const chList=[]
+        // res.data.cbbm.forEach(item=>{
+        //   const data={
+        //     label:item.cbbm,
+        //     value:item.cbbm
+        //   }
+        //   chList.push(data)
+        // })
+        // select.editRender.options=chList
         const sldw = this.$refs.xGrid.getColumnByField('kw')
         sldw.editRender.options = this.dictData.qgkw
 
@@ -259,6 +259,7 @@ export default {
           zlList.push({label:item.bmsm,value:item.bm})
         })
         const zl = this.$refs.xGrid.getColumnByField('zl')
+        console.log(zlList)
         zl.editRender.options = zlList
       })
 

src/views/zyjhzx/bfang/comps/BFangLJTable.vue

@@ -1,6 +1,6 @@
 <template>
-  <div id="bfangLjTable" v-if="showFlag">
-    <VxeGrid ref="bFangRef" v-bind="gridOptions" @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
+  <div id="bfangLjTable">
+    <VxeGrid ref="bFangRef" v-bind="gridOptions" />
   </div>
 </template>
 
@@ -8,6 +8,7 @@
 import tableConfig from './ljTable';
 import {EventBus} from "@/event-bus";
 import {getDmppxxbList} from "@/api/jhzxgl/ypp";
+import {ppBGong} from "@/api/zyjh";
 
 export default {
   name: 'BFangLjTable',
@@ -16,7 +17,6 @@ export default {
       gridOptions:{},
       zyq:'',
       setInterval0:'',
-      showFlag:false,
     }
   },
   created(){
@@ -24,33 +24,53 @@ export default {
     this.gridOptions = options;
     this.gridOptions.columns = columns;
     this.zyq=this.$route.query.zyq
-    EventBus.$on('ljShow', params => {
-      this.initData(params)
+    EventBus.$on('detailShow', params => {
+      this.initData(params.ljList)
+    })
+    EventBus.$on('pl', params => {
+      this.pl(params)
+    })
+    EventBus.$on('bfSave', params => {
+      this.save()
     })
   },
   methods:{
-    checkboxChange(){
-
+    save(){
+      const data=this.$refs.bFangRef.getCheckboxRecords()
+      if (data.length>0){
+        const saveList=[]
+        data.filter(it=>!!it.qq&&!!it.dw).forEach(lj=>{
+          const _lj={
+            id:lj.id,
+            qq:lj.qq,
+            dw:lj.dw,
+            ppzt:'02'
+          }
+          saveList.push(_lj)
+        })
+        ppBGong(saveList).then((res)=>{
+          this.$message.success('成功')
+        })
+      }
     },
-    checkboxAll(){
-
+    pl(params){
+      const data=this.$refs.bFangRef.getCheckboxRecords()
+      if (data.length===0){
+        this.$message.warning('请选择需要批量处理的数据')
+        return
+      }
+      data.forEach(item=>{
+        item.qq=params.qy
+        item.dw=params.dw
+      })
     },
     initData(list){
-      this.gridOptions.data = list;
-      this.showFlag=true
+      this.gridOptions.data=list
     }
   }
 }
 </script>
 
 <style scoped>
-#bfangLjTable {
-  width:81.6%;
-  height: auto;
-  position: absolute;
-  top:78px;
-  left:344px;
-  border: none;
-  margin: 0;
-}
+
 </style>

src/views/zyjhzx/bfang/comps/BFangSearch.vue

@@ -34,6 +34,7 @@ export default {
   },
   mounted() {
     this.getDw()
+
   },
   methods:{
     search(){
@@ -44,7 +45,7 @@ export default {
       EventBus.$emit('bfSave', {})
     },
     pl(){
-      this.$message.error('暂不支持自行调整摆放位置')
+      EventBus.$emit('pl', this.plParam)
     },
     qyChange({value}){
       this.dwList=[]

src/views/zyjhzx/bfang/comps/BFangTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="bfangTable">
-    <VxeGrid ref="bFangRef" v-bind="gridOptions" />
+    <VxeGrid ref="bFangRef" v-bind="gridOptions" @cell-dblclick="showDetail" />
   </div>
 </template>
 
@@ -23,12 +23,12 @@ export default {
     this.gridOptions = options;
     this.gridOptions.columns = columns;
     this.zyq=this.$route.query.zyq
-    EventBus.$on('bfSave', params => {
-      this.save()
-    })
     this.yppShow()
   },
   methods:{
+    showDetail({row}){
+      EventBus.$emit('detailShow', row)
+    },
     save(){
       const data=this.$refs.bFangRef.getCheckboxRecords()
       if(data.length >0){
@@ -41,11 +41,11 @@ export default {
             dcFd:item.dcFd,
             ljList:[]
           }
-          item.ljList.forEach(lj=>{
+          item.ljList.filter(it=>!!it.qq&&!!it.dw).forEach(lj=>{
             const _lj={
               id:lj.id,
-              qq:item.qy,
-              dw:item.dwh,
+              qq:lj.qq,
+              dw:lj.dw,
               ppzt:'02'
             }
             data.ljList.push(_lj)
@@ -68,7 +68,9 @@ export default {
       wbfList(params).then((res) => {
         res.data.forEach(item => {
           item.selected = false
-          item.ljsl=item.ljList.length
+          item.total=item.ljList.length||0
+          item.wbf=item.ljList.filter(it=>it.ppzt==='01').length
+          item.ybf=item.total-item.wbf
           for (const dw of this.dwxx) {
             if (item.dwxxId === dw.id) {
               item.qy = dw.qy
@@ -96,13 +98,5 @@ export default {
 </script>
 
 <style scoped>
-#bfangTable {
-  width:81.6%;
-  height: auto;
-  position: absolute;
-  top:78px;
-  left:344px;
-  border: none;
-  margin: 0;
-}
+
 </style>

src/views/zyjhzx/bfang/comps/PPComponent.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="tabsContainer">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="汇总" name="first">
+        <BFangTable />
+      </el-tab-pane>
+      <el-tab-pane label="明细" name="second">
+        <BFangLjTable />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import BFangTable from "@/views/zyjhzx/bfang/comps/BFangTable.vue";
+import BFangLjTable from "@/views/zyjhzx/bfang/comps/BFangLJTable.vue";
+import tableConfig from "@/views/zyjhzx/bfang/comps/ljTable";
+import {EventBus} from "@/event-bus";
+
+export default {
+  name:'PPComponent',
+  components: {BFangLjTable, BFangTable},
+  data(){
+    return{
+      activeName:'first'
+    }
+  },
+  created(){
+    EventBus.$on('detailShow', params => {
+      this.activeName='second'
+    })
+  },
+  methods:{
+
+  }
+}
+</script>
+<style scoped>
+.el-tabs__content {
+  display: flex;
+  flex-direction: column;
+}
+.el-tab-pane {
+  flex: 1; /* 让tab-pane填满可用空间 */
+}
+</style>

src/views/zyjhzx/bfang/comps/ljTable.js

@@ -1,6 +1,6 @@
 export default function () {
   const options={
-    height:840,
+    height:786,
     align:'center',
     border: true,
     resizable: true,
@@ -15,393 +15,59 @@ export default function () {
 
   const columns = [
     { type: 'checkbox', width: 40 },
-    { type: 'seq', width: 40, title: '序号' },
-
-
-    { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'czbh', title: '船号', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pl', title: '批量', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'fd', title: '分段', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'tlth', title: '套料图号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-
-    { field: 'ljbh', title: '零件编号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    // { field: 'ljmc', title: '零件名称', width: 100,
-    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-    //   filterRender: { name: 'FilterCombination', },
-    // },
-
-    { field: 'ljgg', title: '零件规格', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'ljcz', title: '零件材质', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'sl', title: '数量', width: 70,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-
-    { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'dzjz', title: '大组极重', minWidth: "70",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xdb', title: 'X大板', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xskj', title: 'X数控件', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xpt', title: 'X平铁', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xyw', title: 'X压弯', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xxc', title: 'X型材', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'ddb', title: 'D大板', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dqb', title: 'D曲板', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dxc', title: 'D型材T', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dsj', title: 'D散件', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'dgdh', title: '打磨工单号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dmsbbh', title: '打磨设备编号', width: 100,
+    { type: 'seq',width: 40 , title: '序号' },
+    { field: 'ppzt', title: '状态',  formatter: ['dictFormat', 'PPZT'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'dmcd', title: '打磨打磨长度', width: 100,
+    { field: 'czbh', title: '船号',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dmjhrq', title: '打磨计划日期', width: 100,
+    { field: 'pl', title: '批量',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dmXfry', title: '打磨派工人', width: 100,
+    { field: 'fd', title: '分段',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'dmXfrq', title: '打磨派工日期', width: 100,
+    { field: 'kw', title: '跨位', formatter: ['dictFormat', 'QGKW'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'dscry', title: '打磨生产人员', width: 100,
+    { field: 'zl', title: '组立', formatter: ['dictFormat','ZLLB'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-
-
-    { field: 'dmFkry', title: '打磨反馈人', width: 100,
+    { field: 'tlth', title: '套料图号',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+    { field: 'ljbh', title: '零件编号',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'pgdh', title: '坡口工单号', width: 100,
+    { field: 'ljgg', title: '零件规格',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'pkjhrq', title: '坡口计划日期', width: 120,
+    { field: 'ljcz', title: '零件材质',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'pgdh', title: '坡口工单号', width: 100,
+    { field: 'sl', title: '数量',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'pksbbh', title: '坡口设备编号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pklx', title: '坡口类型', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pkcd', title: '坡口长度', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'pkXfry', title: '坡口派工人员', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pkXfrq', title: '坡口派工日期', width: 120,
+    { field: 'qq', title: '摆放区域',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'pscry', title: '坡口生产人员', width: 100,
+    { field: 'dw', title: '摆放垛位',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'pkFkry', title: '坡口反馈人', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qgdh', title: '  曲工单号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'qsbbh', title: '曲设备编号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'qscry', title: '曲生产人员', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'qjgXfry', title: '曲派工人员', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgXfrq', title: '曲派工日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgFkry', title: '曲反馈人', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    //-------------------------------------------
-
-    // --------------------------------------------------------------
-
-
-    {
-      field: 'slfkry',
-      title: '上料反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'slfkrq',
-      title: '上料反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwfkry',
-      title: '抛丸反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwfkrq',
-      title: '抛丸反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'llfkry',
-      title: '理料反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'llfkrq',
-      title: '理料反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-
-    {
-      field: 'hxfkrq',
-      title: '划线反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'hxfkry',
-      title: '划线反馈人员',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-
-    {
-      field: 'qgfkry',
-      title: '切割反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'qgfkrq',
-      title: '切割反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'sljhrq',
-      title: '上料计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwjhrq',
-      title: '抛丸计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'lljhrq',
-      title: '理料计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'hxjhrq',
-      title: '划线计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'qgjhrq',
-      title: '切割计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
   ]
 
   return {options,columns}

src/views/zyjhzx/bfang/comps/table.js

@@ -1,13 +1,13 @@
 export default function () {
   const options={
-    height:840,
+    height:786,
     align:'center',
     border: true,
     resizable: true,
     keepSource:true,
     size:'mini',
     showOverflow: true,
-    // scrollY:{enable:true},
+    scrollY:{enable:true},
     editConfig:{trigger: 'click', mode: 'cell', showStatus: true},
     highlightCurrentRow:true,
     data:[],
@@ -16,27 +16,51 @@ export default function () {
   const columns = [
     { type: 'checkbox', width: 40 },
     { type: 'seq', width: 60, title: '序号' },
-    { field: 'dcCh', title: '船号', width: 120,
+    { field: 'dcCh', title: '船号',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dcPl', title: '批量', width: 100,
+    { field: 'dcPl', title: '批量',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dcFd', title: '分段', width: 100,
+    { field: 'dcFd', title: '分段',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'qy', title: '摆放区域', width: 100,
+    { field: 'zl', title: '组立',formatter: ['dictFormat', 'ZLLB'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'dwh', title: '垛位', width: 100,
+    { field: 'kw', title: '跨位', formatter: ['dictFormat', 'QGKW'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'ljsl', title: '零件数量', width: 100,
+    { field: 'lx', title: '流向',
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'qy', title: '参考区域',
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dwh', title: '参考垛位',
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xqrq', title: '前方需求日期',
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'total', title: '总数量',
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'ybf', title: '已摆放数量',
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'wbf', title: '待摆放数量',
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },

src/views/zyjhzx/bfang/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div id="bfang" class="bfang" ref="bfangRef" />
     <BFangSearch />
-    <BFangTable />
+    <PPComponent id="pp-component" ref="ppComponentRef" />
     <ZyjhSelectComp id="selectComp" ref="selRef"  @initWorkers="initWorkers"/>
   </div>
 </template>
@@ -12,16 +12,14 @@ import container from "@/views/zyjhzx/bfang/comps/container";
 import drawTitle from "@/views/zyjhzx/bfang/comps/title";
 import BFangSearch from "@/views/zyjhzx/bfang/comps/BFangSearch.vue";
 import initSearch from "@/views/zyjhzx/bfang/comps/search";
-import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
 import workers from "@/views/zyjhzx/bfang/comps/person";
 import {getBzryByBz} from "@/api/zyjh";
 import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
-import BFangShow from "@/views/zyjhzx/bfang/comps/BFangShow.vue";
-import BFangTable from "@/views/zyjhzx/bfang/comps/BFangTable.vue";
+import PPComponent from "@/views/zyjhzx/bfang/comps/PPComponent.vue";
 
 export default {
   name: 'BFang',
-  components: {BFangShow, ZyjhSelectComp, BFangTable, SliaoSearch, BFangSearch},
+  components: {PPComponent, ZyjhSelectComp, BFangSearch},
   data(){
     return{
       width:0,
@@ -89,6 +87,15 @@ export default {
 </script>
 
 <style>
+#pp-component{
+  width:81.6%;
+  height: auto;
+  position: absolute;
+  top:78px;
+  left:344px;
+  border: none;
+  margin: 0;
+}
 #selectComp {
   width:50%;
   height: auto;