修正

src/api/jhzxgl/ypp.js

@@ -17,6 +17,7 @@ export function saveBfwz(data={}) {return request({url: '/dwxx/addOrEdit', metho
 
 
 export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})}
+export function getDmppxxbListAndYz(data={}) {return request({url: '/dmPpxxb/getDmppxxbListAndYz', method: 'post', data})}
 
 export function saveDmppxxb(data) {return request({url: '/dmPpxxb/saveDmppxxb', method: 'post', data})}
 export function saveDmppxxbpg(data) {return request({url: '/dmPpxxb/saveDmppxxbpg', method: 'post', data})}

src/views/jhzxgl/sljhD.vue

@@ -775,6 +775,15 @@ export default {
           filterRender: { name: 'FilterCombination' },
         },
 
+        {
+          title: '抛丸备注',
+          width: "70px",
+          field: 'pwbz',
+
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
+
         {
           title: '入库日期',
           width: "70px",

src/views/jhzxgl/yppFK.vue

@@ -202,7 +202,7 @@ import {null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
-import {saveDmppxxb, getDmppxxbList, saveDmppxxbpg} from "@/api/jhzxgl/ypp";
+import {saveDmppxxb, getDmppxxbList, saveDmppxxbpg, getDmppxxbListAndYz} from "@/api/jhzxgl/ypp";
 export default {
   name:'Cgjhdh',
   data() {
@@ -263,6 +263,13 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        {
+          field: 'ypph',
+          title: '虚拟托盘',
+          width: 120,
+          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', },
@@ -670,6 +677,13 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
+        {
+          field: 'yzkw',
+          title: '配盘跨位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
         {
           field: 'yzZl',
           title: '配盘组立',
@@ -907,7 +921,7 @@ export default {
       //   this.$message.warning('选择船只编号')
       //   return
       // }
-      getDmppxxbList(this.queryParam).then((res) => {
+      getDmppxxbListAndYz(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)

src/views/jhzxgl/yppyz.vue

@@ -162,6 +162,13 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
+        {
+          field: 'ypph',
+          title: '虚拟托盘',editRender: { name: 'input' },
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
         {
           field: 'dcPl',
           title: '批量',editRender: { name: 'input' },
@@ -178,14 +185,20 @@ export default {
         },
         {
           field: 'kw',
-          title: '跨位',editRender: { name: 'input' },
+          title: '跨位', formatter: ['dictFormat', 'QGKW'],
+          editRender: {
+            name: '$select', options: [],
+            optionProps: {value: 'bm', label: 'bmsm'},
+            props: {clearable: true}
+            , events: {change: this.selectChange}
+          },
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
           field: 'zl',
-          title: '组立',editRender: { name: '$select',options: [{label: '小组立',value:'X'},{label: '中大组立',value:'D'}], },
+          title: '组立',editRender: { name: '$select',options: [{label: '小组立',value:'X'},{label: '中大组立',value:'D'}], props: {clearable: true} },
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -218,20 +231,14 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-        {
-          field: 'ppch',
-          title: '配盘船号',editRender: { name: 'input' },
-          width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'ypph',
-          title: '预配盘号',editRender: { name: 'input' },
-          width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
+        // {
+        //   field: 'ppch',
+        //   title: '配盘船号',editRender: { name: 'input' },
+        //   width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+
       ]
     }
   },
@@ -283,6 +290,13 @@ export default {
           chList.push(data)
         })
         select.editRender.options=chList
+
+
+
+        const sldw = this.$refs.xGrid.getColumnByField('kw')
+        sldw.editRender.options = this.dictData.qgkw
+
+
         // console.log(this.dictData)
         // const xGrid = this.$refs.xGrid
         //