Merge remote-tracking branch 'origin/master'

src/views/jhzxgl/pwjhD.vue

@@ -118,6 +118,7 @@
 
 
             <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
+            <el-button type="primary">出库处理</el-button>
 <!--            <span style="width:6%" >反馈人员:</span>-->
 <!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
 <!--            <span style="width:6%" >反馈日期:</span>-->

src/views/zyjhzx/hxianfkui/index.vue

@@ -55,7 +55,7 @@ export default {
     this.initKonvaStage();
   },
   created(){
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods:{

src/views/zyjhzx/hxianpgong/index.vue

@@ -55,7 +55,7 @@ export default {
   created(){
     this.zyq=this.$route.query.zyq
     this.deviceId=this.$route.query.deviceId||''
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods:{

src/views/zyjhzx/lliaofkui/index.vue

@@ -75,7 +75,7 @@ export default {
   },
   created(){
     this.deviceId=this.$route.query.deviceId||''
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{
     zyjhzx(data){

src/views/zyjhzx/lliaopgong/index.vue

@@ -42,7 +42,7 @@ export default {
     this.initKonvaStage();
   },
   created(){
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods:{

src/views/zyjhzx/pwanfkui/index.vue

@@ -55,7 +55,7 @@ export default {
     this.initKonvaStage();
   },
   created(){
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods:{

src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue

@@ -47,7 +47,10 @@ export default {
         }
       })
       // this.gridOptions.data = this.list
-      this.showData(this.list)
+      this.showData(this.list,false)
+      EventBus.$emit('pwtgComp', {
+        flag:true
+      })
     })
   },
   created(){
@@ -83,13 +86,13 @@ export default {
     }
   },
   methods:{
-    showData(list){
+    showData(list,flag=false){
-      if (this.tmpList.length===0){
+      if (this.tmpList.length===0||flag){
         this.tmpList=list
       }
 
       this.list=this.tmpList.filter(item=>item.zt==='BF')
-      this.gridOptions.data = this.list
+      this.gridOptions.data = this.list.reverse()
     },
     // initData(){
     //   bgControl({}).then(res=>{

src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue

@@ -33,6 +33,11 @@ export default {
     EventBus.$on('pwpg', item => {
       this.gridOptions.data.push(item)
     })
+    EventBus.$on('pwtgComp', item => {
+      if (item.flag){
+        // this.gridOptions.data = []
+      }
+    })
   },
   created(){
     const {options,columns,setExt}=paoWanPgdConfig(window.innerHeight*0.95)
@@ -75,6 +80,7 @@ export default {
           })
         })
       }
+
       this.gridOptions.data = []
     },
     export(){
@@ -102,6 +108,18 @@ export default {
               break;
             }
           }
+          for (const dw of this.gridOptions.tlt) {
+            if (item.kw===dw.bm){
+              _item.垮位=dw.bmsm
+              break;
+            }
+          }
+          for (const dw of this.gridOptions.zl) {
+            if (item.zl===dw.bm){
+              _item.组立=dw.name
+              break;
+            }
+          }
           printData.push(_item)
         })
         const workBook = XLSX.utils.book_new();
@@ -122,8 +140,8 @@ export default {
         }
         data.push(item)
       })
-      this.gridOptions.data=data
+      this.gridOptions.data=data.reverse()
-      console.log(this.gridOptions.data)
+      this.$refs.vxeGrid.setAllCheckboxRow(false);
     },
   }
 }

src/views/zyjhzx/pwanpgong/comps/pgdTable.js

@@ -18,7 +18,26 @@ export default function (_height=0) {
     showOverflow: true,
     scrollY:{enable:true},
     data:[],
-    ycldw:[]
+    ycldw:[],
+    tlt:[
+      {"bmsm": "2跨超长超宽曲板", "bmlb": "QGKW", "bm": "10"},
+      {"bmsm": "2跨T型材腹板", "bmlb": "QGKW", "bm": "11"},
+      {"bmsm": "2跨激光切割板", "bmlb": "QGKW", "bm": "12"},
+      {"bmsm": "3跨曲板", "bmlb": "QGKW", "bm": "13"},
+      {"bmsm": "3跨厚板", "bmlb": "QGKW", "bm": "14"},
+      {"bmsm": "4跨普通板", "bmlb": "QGKW", "bm": "15"},
+      {"bmsm": "7跨型板", "bmlb": "QGKW", "bm": "16"},
+      {"bmsm": "光电", "bmlb": "QGKW", "bm": "17"},
+      {"bmsm": "2跨T型材面板", "bmlb": "QGKW", "bm": "5"},
+      {"bmsm": "3跨平铁", "bmlb": "QGKW", "bm": "6"},
+      {"bmsm": "1跨平直大板", "bmlb": "QGKW", "bm": "7"},
+      {"bmsm": "1跨进线板", "bmlb": "QGKW", "bm": "8"},
+      {"bmsm": "2跨超长超宽板", "bmlb": "QGKW", "bm": "9"}
+    ],
+    zl:[
+      {"name": "小组立", "bm": "1010"},
+      {"name": "中大组立", "bm": "1110"},
+    ]
   }
   const ext={}
   const setExt=function (key,value){
@@ -48,19 +67,36 @@ export default function (_height=0) {
       }
     }
   }
+  const kwFormat=function ({cellValue}){
+    for (const item of options.tlt) {
+      if (cellValue===item.bm){
+        return item.bmsm
+      }
+    }
+  }
+
+  const zlFormat=function ({cellValue}){
+    for (const item of options.zl) {
+      if (cellValue===item.bm){
+        return item.name
+      }
+    }
+  }
   const columns = [
     { type: 'checkbox', width: 40 },
-    { type: 'seq',title:'序号', width: 60 },
+    { type: 'seq',title:'序号', width: 50 },
     {field: 'dwId', title: '垛位', width: 100,formatter: dwFormat},
-    {field: 'ceng', title: '层数', width: 60},
+    {field: 'ceng', title: '层数', width: 50},
-    {field: 'czbh', title: '船号'},
+    {field: 'czbh', title: '船号', width: 80},
-    {field: 'pl', title: '批量'},
+    {field: 'pl', title: '批量', width: 50},
-    {field: 'fd', title: '分段',visible:false},
+    {field: 'fd', title: '分段',width: 50,visible:false},
-    {field: 'tlth', title: '套料图号',visible:false},
+    {field: 'tlth', title: '套料图号',width: 120},
-    {field: 'wpgg', title: '物品规格', },
+    {field: 'wpgg', title: '物品规格', width: 120,},
-    {field: 'wlh', title: '物料号', },
+    {field: 'wlh', title: '物料号', width: 130,},
-    {field: 'nm', title: '内码',visible:false },
+    {field: 'kw', title: '垮位',width: 130,formatter: kwFormat},
-    {field: '', title: '备注',visible:false },
+    {field: 'zl', title: '组立', width: 70,formatter: zlFormat},
+    {field: 'nbsbm', title: '入库批号',minWidth: 100,},
+    {field: '', title: '备注',width: 50,visible:false },
   ]
 
   return {

src/views/zyjhzx/pwanpgong/index.vue

@@ -61,7 +61,7 @@ export default {
   created(){
     this.zyq=this.$route.query.zyq
     this.deviceId=this.$route.query.deviceId||''
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{
     slComplete(){
@@ -141,7 +141,7 @@ export default {
           const item=res.data[i]
           const dwGroup=dw(i,item)
           dwGroup.on('click tap',function (){
-            that.$refs.pwpgd.showData(item.list)
+            that.$refs.pwpgd.showData(item.list,true)
           })
           group.add(dwGroup)
         }

src/views/zyjhzx/qgefkui/index.vue

@@ -57,7 +57,7 @@ export default {
     this.initKonvaStage();
   },
   created(){
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods: {

src/views/zyjhzx/qgepgong/index.vue

@@ -56,7 +56,7 @@ export default {
   created(){
     this.zyq=this.$route.query.zyq
     this.deviceId=this.$route.query.deviceId||''
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods:{

src/views/zyjhzx/sliao/index.vue

@@ -60,7 +60,7 @@ export default {
     this.initTlt()
   },
   created(){
-    window.addEventListener('resize', this.initKonvaStage)
+    // window.addEventListener('resize', this.initKonvaStage)
   },
   sockets:{},
   methods:{
@@ -390,7 +390,7 @@ export default {
                       sljhrq:item.sljhrq,
                       qgjhrq:item.qgjhrq,
                       wlh:item.slwlh,
-                      nm:item.nm,
+                      nbsbm:item.nbsbm,
                       bfr:that.getCurrentWorker()?.userCode,
                       type:'YCL'
                     }