From 16bd95c8fc5ffde6f5569246cef8f763ef478ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 19 Mar 2025 17:10:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E6=91=86=E6=94=BE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jhzxgl/ypp.js | 1 + src/api/sjzx/bzzGL.js | 8 +- src/api/zyjh.js | 8 + src/views/jhzx/ydjhzxCX.vue | 66 ++++---- src/views/jhzxgl/yppFK.vue | 13 +- src/views/jhzxgl/yppyz.vue | 16 +- src/views/zyjhzx/bfang/comps/BFangSearch.vue | 10 +- src/views/zyjhzx/bfang/comps/BFangShow.vue | 142 +++++++++++++----- src/views/zyjhzx/bfang/index.vue | 4 +- src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue | 1 - 10 files changed, 171 insertions(+), 98 deletions(-) diff --git a/src/api/jhzxgl/ypp.js b/src/api/jhzxgl/ypp.js index 13e3731..19a6867 100644 --- a/src/api/jhzxgl/ypp.js +++ b/src/api/jhzxgl/ypp.js @@ -15,6 +15,7 @@ export function getBfwz(data={}) {return request({url: '/dwxx/list', method: 'po */ export function saveBfwz(data={}) {return request({url: '/dwxx/addOrEdit', method: 'post', data})} +export function getYppyzList(data={}) {return request({url: '/yppyz/list', method: 'post', data})} export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})} export function getDmppxxbListAndYz(data={}) {return request({url: '/dmPpxxb/getDmppxxbListAndYz', method: 'post', data})} diff --git a/src/api/sjzx/bzzGL.js b/src/api/sjzx/bzzGL.js index a51b8c7..09b9269 100644 --- a/src/api/sjzx/bzzGL.js +++ b/src/api/sjzx/bzzGL.js @@ -68,7 +68,13 @@ export function getryBase(data) { }); } - +export function bgList(data) { + return request({ + url: "/yppyz/bgList", + method: "post", + data, + }); +} export function yppyzcx(data) { return request({ diff --git a/src/api/zyjh.js b/src/api/zyjh.js index 91e05fc..cf14331 100644 --- a/src/api/zyjh.js +++ b/src/api/zyjh.js @@ -1,5 +1,13 @@ import request from '@/utils/request' +export function ppBGong(data) { + return request({ + url: "/zyjh/ppBGong", + method: "post", + data + }); +} + export function getBzryByBz(params) { return request({ url: "/zyjh/getBzryByBz", diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue index a6a9a63..89b03fb 100644 --- a/src/views/jhzx/ydjhzxCX.vue +++ b/src/views/jhzx/ydjhzxCX.vue @@ -153,63 +153,58 @@ export default { sbxx:{}, height: '500px', tableColumn1:[ - { type: 'seq', width: 60, title: '序号'}, - { field: 'dcCh', title: '船号',width: 100, + { type: 'seq', width: 25, title: '序号'}, + { field: 'dcCh', title: '船号\n',width: 80, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - // { field: 'dcCh1', title: '目标船号',width: 90, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空 - { field: 'dcPl', title: '批量',width: 80, + { field: 'dcPl', title: '批量\n',width: 60, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - - { field: 'jssj', title: '分段钢料需求',width: 110, + { field: 'jssj', title: '分段\n钢料需求',width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - - { field: 'sljhrq', title: '上料计划日期',width: 100, + { field: 'sljhrq', title: '上料\n计划日期',width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }} }, - { field: 'pwjhrq', title: '抛丸计划日期',width: 100, + { field: 'pwjhrq', title: '抛丸\n计划日期',width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }} }, - { field: 'hxjhrq', title: '划线计划日期',width: 100, + { field: 'hxjhrq', title: '划线\n计划日期',width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }} }, - { field: 'qgjhrq', title: '切割计划日期',width: 100, + { field: 'qgjhrq', title: '切割\n计划日期',width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }} }, - { field: 'bs', title: '套料图数',width: 80, + { field: 'bs', title: '套料图\n',width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'ylbs', title: '余料板数',width: 80, + { field: 'ylbs', title: '余料\n板数',width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'slxhthCount', title: '上料匹配板数',width: 80, + { field: 'slxhthCount', title: '上料匹配\n板数',width: 80, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'slCount', title: '上料板数',width: 80, + { field: 'slCount', title: '上料\n板数',width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'pwCount', title: '抛丸板数',width: 80, + { field: 'pwCount', title: '抛丸\n板数',width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, // { field: 'llCount', title: '理料板数',width: 80, // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filterRender: { name: 'FilterCombination', }}, - { field: 'hxCount', title: '划线板数',width: 80, + { field: 'hxCount', title: '划线\n板数',width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'qgCount', title: '切割板数',width: 80, + { field: 'qgCount', title: '切割\n板数',width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, { title: '1跨', @@ -254,7 +249,6 @@ export default { }, ], tableColumn:[ - { type: 'checkbox', width: 50 ,}, { type: 'seq', width: 60, title: '序号'}, // { field: 'jhlx', title: '计划类型',width: 70,formatter:this.formatterZt, // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -274,7 +268,7 @@ export default { { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'], + { field: 'kw', title: '跨位',width: 120,formatter: ['dictFormat','QGKW'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, { field: 'tzbh', title: '套料图号',width: 90, @@ -288,20 +282,20 @@ export default { { field: 'ylbs', title: '余料',width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { - field: 'slkcdw', - title: '上料库存垛位', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'slcs', - title: '上料层数', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, + // { + // field: 'slkcdw', + // title: '上料库存垛位', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'slcs', + // title: '上料层数', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, // { // field: 'slxhth', // title: '上料小合同号', diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue index 031dc2d..9c4a6a0 100644 --- a/src/views/jhzxgl/yppFK.vue +++ b/src/views/jhzxgl/yppFK.vue @@ -149,9 +149,8 @@ + 完整性检查 报工 - - @@ -722,10 +721,16 @@ export default { window.addEventListener('resize', this.getHeight) this.getHeight() this.initBase() - - }, methods: { + //完整性检查 + wzxjc(){ + if (!this.queryParam.dcch){ + this.$message.warning('请选择船号') + return; + } + + }, zlFormat({cellValue}){ if(cellValue==='D'){ return '中大组立' diff --git a/src/views/jhzxgl/yppyz.vue b/src/views/jhzxgl/yppyz.vue index 068505c..bf7f900 100644 --- a/src/views/jhzxgl/yppyz.vue +++ b/src/views/jhzxgl/yppyz.vue @@ -26,16 +26,9 @@ - 保存 + 保存 添加 - 删除 - + 删除 @@ -111,6 +104,7 @@ export default { queryParam: { dcCh:'', dcPl:'', + status:'全部', }, inParam:{ rqfw:'', @@ -359,7 +353,7 @@ export default { dwList.forEach(dwxx=>{ if (dwxx.qy===item.qy&&dwxx.dwh===item.dwh){ item.dwxxId=dwxx.id - item.status=1 + item.status='设置垛位' } }) }) @@ -378,7 +372,7 @@ export default { dwList.forEach(dwxx=>{ if (dwxx.qy===item.qy&&dwxx.dwh===item.dwh){ item.dwxxId=dwxx.id - item.status=1 + item.status='设置垛位' } }) }) diff --git a/src/views/zyjhzx/bfang/comps/BFangSearch.vue b/src/views/zyjhzx/bfang/comps/BFangSearch.vue index 2394333..48e08ea 100644 --- a/src/views/zyjhzx/bfang/comps/BFangSearch.vue +++ b/src/views/zyjhzx/bfang/comps/BFangSearch.vue @@ -1,7 +1,7 @@