diff --git a/package.json b/package.json
index 3d180a1..9104a5f 100644
--- a/package.json
+++ b/package.json
@@ -49,9 +49,9 @@
"vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0",
"vuex": "3.1.0",
- "vxe-table": "^3.4.14",
+ "vxe-table": "^3.7.5",
"vxe-table-plugin-export-xlsx": "^2.3.1",
- "xe-utils": "^3.2.1",
+ "xe-utils": "^3.5.14",
"xlsx": "^0.14.1"
},
"devDependencies": {
diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js
index c7b58ff..34b650a 100644
--- a/src/api/jhzxgl/pgd.js
+++ b/src/api/jhzxgl/pgd.js
@@ -5,3 +5,34 @@ export function saveTzjhPgdXd(data) {return request({url: '/pgdTzjh/saveTzjhPgdX
export function saveTzjhPgdXdBack(data) {return request({url: '/pgdTzjh/saveTzjhPgdXdBack', method: 'post', data})}
export function saveTzjhPgdFk(data) {return request({url: '/pgdTzjh/saveTzjhPgdFk', method: 'post', data})}
export function getPgdBase(data) {return request({url: '/pgdTzjh/getPgdBase', method: 'post', data})}
+
+
+
+export function getDhPgd(data) {return request({url: '/pgdDh/getDhPgd', method: 'post', data})}
+export function saveDhPgdXd(data) {return request({url: '/pgdDh/saveDhPgdXd', method: 'post', data})}
+export function saveDhPgdXdBack(data) {return request({url: '/pgdDh/saveDhPgdXdBack', method: 'post', data})}
+export function saveDhPgdFk(data) {return request({url: '/pgdDh/saveDhPgdFk', method: 'post', data})}
+
+
+
+
+export function getSljhPgd(data) {return request({url: '/pgdSljh/getSljhPgd', method: 'post', data})}
+export function saveSljhPgdXd(data) {return request({url: '/pgdSljh/saveSljhPgdXd', method: 'post', data})}
+export function saveSljhPgdXdBack(data) {return request({url: '/pgdSljh/saveSljhPgdXdBack', method: 'post', data})}
+export function saveSljhPgdFk(data) {return request({url: '/pgdSljh/saveSljhPgdFk', method: 'post', data})}
+
+
+
+export function getPwPgd(data) {return request({url: '/pgdPwjh/getPwPgd', method: 'post', data})}
+export function savePwPgdXd(data) {return request({url: '/pgdPwjh/savePwPgdXd', method: 'post', data})}
+export function savePwPgdXdBack(data) {return request({url: '/pgdPwjh/savePwPgdXdBack', method: 'post', data})}
+export function savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})}
+
+
+export function getQgPgd(data) {return request({url: '/pgdPwjh/getQgPgd', method: 'post', data})}
+export function saveQgPgdXd(data) {return request({url: '/pgdPwjh/saveQgPgdXd', method: 'post', data})}
+export function saveQgPgdXdBack(data) {return request({url: '/pgdPwjh/saveQgPgdXdBack', method: 'post', data})}
+export function saveQgPgdFk(data) {return request({url: '/pgdPwjh/saveQgPgdFk', method: 'post', data})}
+
+
+
diff --git a/src/views/jhzxgl/components/GxsqAdd.vue b/src/views/jhzxgl/components/GxsqAdd.vue
new file mode 100644
index 0000000..c6ef8be
--- /dev/null
+++ b/src/views/jhzxgl/components/GxsqAdd.vue
@@ -0,0 +1,601 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jhzxgl/dhqdD.vue b/src/views/jhzxgl/dhqdD.vue
index f1823f7..a727233 100644
--- a/src/views/jhzxgl/dhqdD.vue
+++ b/src/views/jhzxgl/dhqdD.vue
@@ -1,23 +1,57 @@
-
+
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -26,17 +60,30 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 批量
+
+
+
+
+ 反馈
+ 接收
+
@@ -57,13 +104,19 @@
:columns="tableColumn"
highlight-current-row
:data="list"
- :custom-config="{ storage: true }"
+ :scroll-y="{enabled: true}"
+ :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
highlight-hover-row
show-overflow
show-header-overflow
+
>
+
+
+
+
@@ -72,10 +125,12 @@
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
new file mode 100644
index 0000000..5ac6a21
--- /dev/null
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -0,0 +1,531 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量
+
+
+
+
+ 反馈
+ 接收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
new file mode 100644
index 0000000..74cdf79
--- /dev/null
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -0,0 +1,567 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量
+
+
+
+
+ 反馈
+ 接收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
new file mode 100644
index 0000000..a60eb7c
--- /dev/null
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -0,0 +1,580 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量
+
+
+
+
+ 反馈
+ 接收
+ 取自
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
new file mode 100644
index 0000000..40b8c58
--- /dev/null
+++ b/src/views/jhzxgl/sljhD.vue
@@ -0,0 +1,549 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量
+
+
+
+
+ 反馈
+ 接收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jhzxgl/tzjhD.vue b/src/views/jhzxgl/tzjhD.vue
index 0eed35f..0b45216 100644
--- a/src/views/jhzxgl/tzjhD.vue
+++ b/src/views/jhzxgl/tzjhD.vue
@@ -62,7 +62,7 @@
-
+
-
+
- 批量
+ 批量
- 保存
- 下达
+ 反馈
+ 接收
@@ -159,7 +159,7 @@ export default {
label: "下达",
},
{
- value: "99",
+ value: "09",
label: "反馈",
},
],
@@ -238,7 +238,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'zt', title: '状态', width: 100,
+ { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -265,7 +265,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'fkyy', title: '反馈原因', width: 100,
+ { field: 'fkyy', title: '反馈原因', width: 100, editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -304,7 +304,7 @@ export default {
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
@@ -340,7 +340,16 @@ export default {
},
saveclick(){
-
+ let obj=this.$refs.xGrid.getUpdateRecords()
+ if(obj.length===0){
+ this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+ return
+ }
+ saveTzjhPgdFk(obj).then(res=>{
+ if(res.success){
+ this.initList()
+ }
+ })
},
xdClick(){
let obj=this.$refs.xGrid.getCheckboxRecords()
diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue
index 363df9a..819394f 100644
--- a/src/views/sjzx/bclqCX.vue
+++ b/src/views/sjzx/bclqCX.vue
@@ -212,7 +212,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+ { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -349,7 +349,7 @@ export default {
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
diff --git a/src/views/sjzx/bclqCX1.vue b/src/views/sjzx/bclqCX1.vue
index e24ef73..aa9eef7 100644
--- a/src/views/sjzx/bclqCX1.vue
+++ b/src/views/sjzx/bclqCX1.vue
@@ -121,7 +121,7 @@
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
-
+ :scroll-y="{enabled: true}"
highlight-hover-row
show-overflow
show-header-overflow
@@ -567,7 +567,7 @@ export default {
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
diff --git a/src/views/sjzx/bctltCX.vue b/src/views/sjzx/bctltCX.vue
index 08f8184..a6570d3 100644
--- a/src/views/sjzx/bctltCX.vue
+++ b/src/views/sjzx/bctltCX.vue
@@ -256,7 +256,7 @@ export default {
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue
index f8de50f..e923d7b 100644
--- a/src/views/sjzx/bcybCX.vue
+++ b/src/views/sjzx/bcybCX.vue
@@ -279,7 +279,7 @@ export default {
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
diff --git a/src/views/sjzx/bomcx.vue b/src/views/sjzx/bomcx.vue
index e1a471a..71ea25c 100644
--- a/src/views/sjzx/bomcx.vue
+++ b/src/views/sjzx/bomcx.vue
@@ -95,6 +95,7 @@
highlight-hover-row
show-overflow
show-header-overflow
+
>
diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue
index 6aa780d..ff89063 100644
--- a/src/views/sjzx/bomwh.vue
+++ b/src/views/sjzx/bomwh.vue
@@ -9,14 +9,38 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -289,6 +313,16 @@ export default {
title:'',
czbhu:'',
phu:'',
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
// tableColumn: [
// { type: 'checkbox', width: 50 },
// { type: 'seq', width: 60, title: '序号' },
@@ -1140,11 +1174,30 @@ export default {
this.tableData=res.data;
})
},
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+ console.log(1);
+
+ if (this.queryParam.dcch) {
+ console.log(this.projectData1);
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+ },
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')
diff --git a/src/views/sjzx/czbhcx.vue b/src/views/sjzx/czbhcx.vue
index b70dd78..6359fdc 100644
--- a/src/views/sjzx/czbhcx.vue
+++ b/src/views/sjzx/czbhcx.vue
@@ -9,11 +9,39 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -23,9 +51,9 @@
-
-
-
+
+
+
@@ -37,9 +65,9 @@
-
-
-
+
+
+
@@ -59,12 +87,15 @@
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
- :edit-config="{ trigger: 'click', mode: 'cell', showStatus: true}"
+
highlight-hover-row
show-overflow
show-header-overflow
-
+ :scroll-y="{enabled: true}"
>
+
+
+
@@ -93,19 +124,29 @@ import {
getList,
add,
edit,
- del,
+ del, getCzplBase,
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj";
export default {
- name:'czbhcx',
+ name:'czbhwh',
data() {
return {
request: {
cbbm:'',
},
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
list: [],
dictData:{},
@@ -114,6 +155,7 @@ export default {
tableColumn: [
{ type: 'checkbox', width: 50 ,
},
+
{ type: 'seq', width: 60, title: '序号' },
{ field: 'cbbm', title: '船号编码', width: 120,editRender: { name: 'input' },
@@ -146,7 +188,12 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'sCzbh', title: '目标船只', width: 120, editRender: { name: 'input' },
+ { field: 'sczbh', title: '目标船只', width: 120,
+ editRender:{ name: '$select', options: [],optionProps: { value: 'cbbm', label: 'cbbm' }, props:{clearable: true}
+ ,events: { change: this.selectChange }},
+
+
+
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -169,6 +216,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
+ { title: '操作', width: 70, slots: { default: 'operation' }, },
{ field: 'pdrq', title: '铺底日期', width: 120, editRender: {
name: '$input',
props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"},
@@ -239,23 +287,43 @@ export default {
methods: {
+ cellClickEvent({row}) {
+ this.request.cbbm = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+ if (this.request.cbbm) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.cbbm.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+
initBase(){
- // getTpBase({}).then(res=>{
- // this.dictData = res.data
- // const xGrid = this.$refs.xGrid
- //
- // const dwbm = xGrid.getColumnByField('dwbm')
- // dwbm.editRender.options = res.data.xqdws
- //
- // })
+ getCzplBase({}).then(res=>{
+ this.dictData = res.data
+
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
+ const xGrid = this.$refs.xGrid
+
+ const sczbh = xGrid.getColumnByField('sczbh')
+ sczbh.editRender.options = res.data.cbbm
+
+ })
},
initList() {
getList(this.request).then((res) => {
this.list = res.data
+ console.log(this.list)
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
}
@@ -330,6 +398,7 @@ export default {
if (updateRecords.length !== 0) {
+ console.log(updateRecords)
edit(updateRecords).then((response) => {
if (response.success) {
const xTable = this.$refs.xGrid
diff --git a/src/views/sjzx/czbhwh.vue b/src/views/sjzx/czbhwh.vue
index 6dcd710..de53ca7 100644
--- a/src/views/sjzx/czbhwh.vue
+++ b/src/views/sjzx/czbhwh.vue
@@ -9,11 +9,39 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -63,7 +91,7 @@
highlight-hover-row
show-overflow
show-header-overflow
-
+ :scroll-y="{enabled: true}"
>
推送
@@ -96,7 +124,7 @@ import {
getList,
add,
edit,
- del,
+ del, getCzplBase,
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
@@ -109,6 +137,16 @@ export default {
cbbm:'',
},
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
list: [],
dictData:{},
@@ -150,7 +188,12 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'sCzbh', title: '目标船只', width: 120, editRender: { name: 'input' },
+ { field: 'sczbh', title: '目标船只', width: 120,
+ editRender:{ name: '$select', options: [],optionProps: { value: 'cbbm', label: 'cbbm' }, props:{clearable: true}
+ ,events: { change: this.selectChange }},
+
+
+
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -244,23 +287,43 @@ export default {
methods: {
+ cellClickEvent({row}) {
+ this.request.cbbm = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+ if (this.request.cbbm) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.cbbm.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+
initBase(){
- // getTpBase({}).then(res=>{
- // this.dictData = res.data
- // const xGrid = this.$refs.xGrid
- //
- // const dwbm = xGrid.getColumnByField('dwbm')
- // dwbm.editRender.options = res.data.xqdws
- //
- // })
+ getCzplBase({}).then(res=>{
+ this.dictData = res.data
+
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
+ const xGrid = this.$refs.xGrid
+
+ const sczbh = xGrid.getColumnByField('sczbh')
+ sczbh.editRender.options = res.data.cbbm
+
+ })
},
initList() {
getList(this.request).then((res) => {
this.list = res.data
+ console.log(this.list)
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
}
@@ -313,8 +376,6 @@ export default {
})
break
case 'save':
-
-
if (removeRecords.length !== 0) {
del(removeRecords).then((response) => {
if (response.success) {
@@ -335,6 +396,7 @@ export default {
if (updateRecords.length !== 0) {
+ console.log(updateRecords)
edit(updateRecords).then((response) => {
if (response.success) {
const xTable = this.$refs.xGrid
@@ -344,6 +406,16 @@ export default {
})
}
if (insertRecords.length !== 0) {
+
+ for(let i =0;i {
if (response.success) {
this.list = this.list.concat(insertRecords)
diff --git a/src/views/sjzx/czplwh.vue b/src/views/sjzx/czplwh.vue
index 5cf736a..f751017 100644
--- a/src/views/sjzx/czplwh.vue
+++ b/src/views/sjzx/czplwh.vue
@@ -9,16 +9,6 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+ 不显示完工船只
+
@@ -90,11 +83,11 @@
- 删除
-
+
+
+
+
+
@@ -121,7 +114,7 @@
highlight-hover-row
show-overflow
show-header-overflow
-
+ :scroll-y="{enabled: true}"
>
@@ -149,13 +142,13 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'Czplwh',
data() {
return {
queryParam: {
dcch:'',
dcpl:'',
-
+ flag:true
},
list: [],
isupload:'02',
@@ -452,10 +445,11 @@ export default {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
-
+ console.log(1);
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ console.log(this.projectData1);
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
diff --git a/src/views/sjzx/ljptCX.vue b/src/views/sjzx/ljptCX.vue
index 7937c72..c202621 100644
--- a/src/views/sjzx/ljptCX.vue
+++ b/src/views/sjzx/ljptCX.vue
@@ -84,7 +84,7 @@
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
-
+ :scroll-y="{enabled: true}"
highlight-hover-row
show-overflow
show-header-overflow
diff --git a/src/views/sjzx/plbXC.vue b/src/views/sjzx/plbXC.vue
index e9f4160..a4667ec 100644
--- a/src/views/sjzx/plbXC.vue
+++ b/src/views/sjzx/plbXC.vue
@@ -9,20 +9,47 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+ 不显示完工船只
+
@@ -30,9 +57,9 @@
-
-
-
+
+
+
@@ -47,7 +74,6 @@
-
@@ -57,14 +83,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -88,7 +114,7 @@
highlight-hover-row
show-overflow
show-header-overflow
-
+ :scroll-y="{enabled: true}"
>
@@ -104,10 +130,10 @@