diff --git a/src/api/sjzx/jcsj.js b/src/api/sjzx/jcsj.js index 7d4bf27..a0376fa 100644 --- a/src/api/sjzx/jcsj.js +++ b/src/api/sjzx/jcsj.js @@ -39,6 +39,7 @@ export function getListBom(data) {return request({url: '/dmBom/getListBom', meth export function getListBomRealy(data) {return request({url: '/dmBom/getListBomRealy', method: 'post', data})} export function addListBom(data) {return request({url: '/dmBom/addListBom', method: 'post', data})} export function saveListBom(data) {return request({url: '/dmBom/saveListBom', method: 'post', data})} +export function copyListBom(data) {return request({url: '/dmBom/copyListBom', method: 'post', data})} export function getBcLQlList(data) {return request({url: '/dmBclqmxp/getBcLQlList', method: 'post', data})} diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue index 2411c21..d429273 100644 --- a/src/views/sjzx/bcybCX.vue +++ b/src/views/sjzx/bcybCX.vue @@ -156,7 +156,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'] + { field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, diff --git a/src/views/sjzx/bomcx.vue b/src/views/sjzx/bomcx.vue index 9aed2b1..cf174a0 100644 --- a/src/views/sjzx/bomcx.vue +++ b/src/views/sjzx/bomcx.vue @@ -3,7 +3,7 @@ - + @@ -18,6 +18,16 @@ + + + + + + @@ -39,6 +49,26 @@ + + + + + + + + + + + + + + + + 取自 + + + + @@ -193,7 +223,7 @@ import { getCzplBase, getListBomRealy, saveListBom, - addListBom, uploadBom, + addListBom, uploadBom,copyListBom } from '@/api/sjzx/jcsj' import { mapGetters } from 'vuex' import XEUtils from 'xe-utils' @@ -220,6 +250,7 @@ export default { dcch:'', dcpl:'', zt:'', + mbch:'', }, tableData: [], isupload:'02', @@ -374,12 +405,12 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'pkbs', title: '坡口長度', width: 120, + { field: 'pkbs', title: '坡口标识', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pkcd', title: '坡口标识', width: 120, + { field: 'pkcd', title: '坡口长度', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -739,7 +770,7 @@ export default { }) }, initList() { - if (this.queryParam.cbbm === '') { + if (this.queryParam.dcch === '') { this.$message.warning('选择船只编号') return } @@ -764,13 +795,34 @@ export default { selectChange(row) { // this.$refs.xGrid.clearActived() // 清除单元格激活状态 - this.$refs.xGrid.clearEdit() // 清除单元格激活状态 + this.$refs.xGrid.clearEdit() // 清除单元格激活状态d // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态 null2str(row.row) }, getHeight() { this.height = window.innerHeight - 190 }, + copy(){ + if(this.queryParam.dcch===this.queryParam.mbch){ + this.$message.warning('船号和目标船号不能一致') + return + } + if(this.queryParam.dcch==='' || this.queryParam.dcch===null ){ + this.$message.warning('船号不能为空') + return + } + if(this.queryParam.mbch==='' || this.queryParam.mbch===null ){ + this.$message.warning('目标船号不能为空') + return + } + copyListBom(this.queryParam).then(res=>{ + if(res.success){ + this.queryParam.dcch=this.queryParam.mbch; + this.queryParam.mbch='' + this.initList(); + } + }) + }, tjClick(){ let selectRecords = this.$refs.xGrid.getCheckboxRecords() diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue index 7694c55..86b1e6c 100644 --- a/src/views/sjzx/bomwh.vue +++ b/src/views/sjzx/bomwh.vue @@ -45,10 +45,10 @@ - 保存 + + + + @@ -722,7 +722,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'tjb.ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'] + { field: 'tjb.ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, diff --git a/src/views/sjzx/xctltCX.vue b/src/views/sjzx/xctltCX.vue index ea1e73b..ea89691 100644 --- a/src/views/sjzx/xctltCX.vue +++ b/src/views/sjzx/xctltCX.vue @@ -153,7 +153,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'] + { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, diff --git a/vue.config.js b/vue.config.js index d444af4..abe9f32 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { * In most cases please use '/' !!! * Detail: https://cli.vuejs.org/config/#publicpath */ - publicPath: '/web', + publicPath: '/', outputDir: 'dist', assetsDir: 'static', lintOnSave: false,