From 6300d8e0d5a1ad19ebd1a3defad7cdf134665d7d 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, 12 Mar 2025 17:28:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jhzx/ydjhzxCX.vue | 6 +- src/views/jhzxgl/yppGL.vue | 809 ++++++++------------ src/views/jhzxgl/yppyz.vue | 19 +- src/views/zyjhzx/bfang/comps/Ypp.vue | 29 + src/views/zyjhzx/bfang/comps/YppDetail.vue | 40 + src/views/zyjhzx/bfang/comps/YppLjTable.vue | 0 src/views/zyjhzx/bfang/index.vue | 2 +- 7 files changed, 398 insertions(+), 507 deletions(-) create mode 100644 src/views/zyjhzx/bfang/comps/Ypp.vue create mode 100644 src/views/zyjhzx/bfang/comps/YppDetail.vue create mode 100644 src/views/zyjhzx/bfang/comps/YppLjTable.vue diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue index be8ae98..63199fe 100644 --- a/src/views/jhzx/ydjhzxCX.vue +++ b/src/views/jhzx/ydjhzxCX.vue @@ -845,9 +845,9 @@ export default { } for (const item of data) { item.zyq=this.plParam.zyq||item.zyq - for (const item of this.zyqList) { - if(item.value===this.plParam.zyq){ - item.zyq1=item.label + for (const _item of this.zyqList) { + if(_item.value===this.plParam.zyq){ + item.zyq1=_item.label } } } diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue index 3441bf3..3a5599c 100644 --- a/src/views/jhzxgl/yppGL.vue +++ b/src/views/jhzxgl/yppGL.vue @@ -2,12 +2,9 @@ - - - - - - @@ -63,33 +56,6 @@ - - - - - - - - - - - - - - - - - @@ -98,78 +64,18 @@ - - - + - - + 批量 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 保存 - - @@ -196,14 +102,9 @@ highlight-hover-row show-overflow show-header-overflow - > - - - - @@ -223,7 +124,7 @@ import { startLoading, endLoading } from '@/utils' import { Message } from 'element-ui' import {saveDmppxxb, getDmppxxbList, saveBfwz} from "@/api/jhzxgl/ypp"; export default { - name:'Cgjhdh', + name:'YppGL', data() { return { queryParam: { @@ -247,8 +148,6 @@ export default { value: "02", label: "已配盘·", }, - - ], inParam:{ qy:'', @@ -272,12 +171,9 @@ export default { }, }, ], - tableColumn: [ { type: 'checkbox', width: 40 }, { type: 'seq', width: 40, title: '序号' }, - - { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -286,7 +182,6 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pl', title: '批量', width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -296,39 +191,30 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'tlth', title: '套料图号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - - { field: 'ljbh', title: '零件编号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - // { field: 'ljmc', title: '零件名称', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, - // }, - + { field: 'ljmc', title: '零件名称', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'ljgg', title: '零件规格', width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ljcz', title: '零件材质', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -341,277 +227,273 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - - { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dzjz', title: '大组极重', minWidth: "70", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xdb', title: 'X大板', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xskj', title: 'X数控件', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xpt', title: 'X平铁', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xyw', title: 'X压弯', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xxc', title: 'X型材', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'ddb', title: 'D大板', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dqb', title: 'D曲板', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dxc', title: 'D型材T', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dsj', title: 'D散件', minWidth: "100", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dgdh', title: '打磨工单号', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dmsbbh', title: '打磨设备编号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dmcd', title: '打磨打磨长度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dmjhrq', title: '打磨计划日期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'dmXfry', title: '打磨派工人', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dmXfrq', title: '打磨派工日期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dscry', title: '打磨生产人员', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - - - { field: 'dmFkry', title: '打磨反馈人', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dmFkrq', title: '打磨反馈日期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'pgdh', title: '坡口工单号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pkjhrq', title: '坡口计划日期', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pgdh', title: '坡口工单号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pksbbh', title: '坡口设备编号', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pklx', title: '坡口类型', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pkcd', title: '坡口长度', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'pkXfry', title: '坡口派工人员', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pkXfrq', title: '坡口派工日期', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'pscry', title: '坡口生产人员', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pkFkrq', title: '坡口反馈日期', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'pkFkry', title: '坡口反馈人', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qgdh', title: ' 曲工单号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qjgjhrq', title: '曲加工计划期', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - - { field: 'qsbbh', title: '曲设备编号', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - - { field: 'qscry', title: '曲生产人员', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - - { field: 'qjgXfry', title: '曲派工人员', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'dzjz', title: '大组极重', minWidth: "70", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xdb', title: 'X大板', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xskj', title: 'X数控件', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xpt', title: 'X平铁', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xyw', title: 'X压弯', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xxc', title: 'X型材', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'ddb', title: 'D大板', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dqb', title: 'D曲板', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dxc', title: 'D型材T', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dsj', title: 'D散件', minWidth: "100", + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'dgdh', title: '打磨工单号', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dmsbbh', title: '打磨设备编号', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'dmcd', title: '打磨打磨长度', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dmjhrq', title: '打磨计划日期', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'dmXfry', title: '打磨派工人', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'dmXfrq', title: '打磨派工日期', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'dscry', title: '打磨生产人员', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, - { field: 'qjgXfrq', title: '曲派工日期', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'qjgFkry', title: '曲反馈人', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'qjgFkrq', title: '曲反馈日期', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'dmFkry', title: '打磨反馈人', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'dmFkrq', title: '打磨反馈日期', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'pgdh', title: '坡口工单号', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pkjhrq', title: '坡口计划日期', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pgdh', title: '坡口工单号', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pksbbh', title: '坡口设备编号', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pklx', title: '坡口类型', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pkcd', title: '坡口长度', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'pkXfry', title: '坡口派工人员', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pkXfrq', title: '坡口派工日期', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'pscry', title: '坡口生产人员', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'pkFkrq', title: '坡口反馈日期', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'pkFkry', title: '坡口反馈人', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'qgdh', title: ' 曲工单号', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'qjgjhrq', title: '曲加工计划期', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // + // { field: 'qsbbh', title: '曲设备编号', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // + // { field: 'qscry', title: '曲生产人员', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // + // { field: 'qjgXfry', title: '曲派工人员', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'qjgXfrq', title: '曲派工日期', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'qjgFkry', title: '曲反馈人', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // + // { field: 'qjgFkrq', title: '曲反馈日期', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, //------------------------------------------- // -------------------------------------------------------------- - { - field: 'slfkry', - title: '上料反馈人', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'slfkrq', - title: '上料反馈日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'pwfkry', - title: '抛丸反馈人', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'pwfkrq', - title: '抛丸反馈日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'llfkry', - title: '理料反馈人', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'llfkrq', - title: '理料反馈日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - - { - field: 'hxfkrq', - title: '划线反馈日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'hxfkry', - title: '划线反馈人员', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, + // { + // field: 'slfkry', + // title: '上料反馈人', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'slfkrq', + // title: '上料反馈日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'pwfkry', + // title: '抛丸反馈人', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'pwfkrq', + // title: '抛丸反馈日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'llfkry', + // title: '理料反馈人', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'llfkrq', + // title: '理料反馈日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // + // { + // field: 'hxfkrq', + // title: '划线反馈日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'hxfkry', + // title: '划线反馈人员', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, { field: 'qgfkry', @@ -627,44 +509,41 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination' } }, - { - field: 'sljhrq', - title: '上料计划日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'pwjhrq', - title: '抛丸计划日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'lljhrq', - title: '理料计划日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'hxjhrq', - title: '划线计划日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - { - field: 'qgjhrq', - title: '切割计划日期', - width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, - - - + // { + // field: 'sljhrq', + // title: '上料计划日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'pwjhrq', + // title: '抛丸计划日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'lljhrq', + // title: '理料计划日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'hxjhrq', + // title: '划线计划日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, + // { + // field: 'qgjhrq', + // title: '切割计划日期', + // width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, ] } }, @@ -675,11 +554,8 @@ export default { window.addEventListener('resize', this.getHeight) this.getHeight() this.initBase() - - }, methods: { - cellClickEvent({row}) { this.queryParam.dcch = row.cbbm this.$refs.xDown4.hidePanel() @@ -688,20 +564,16 @@ export default { this.$refs.xDown4.showPanel() }, keyupEvent4() { - - if (this.queryParam.dcch) { this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1) } else { this.projectData = this.projectData1.slice(0) } - }, ztChange(){ this.list=[] }, bzClick(){ - this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy) }, bzClick1(){ @@ -709,7 +581,6 @@ export default { }, async updates2() { let selectRecords = this.$refs.xGrid.getCheckboxRecords() - const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy) if (selectRecords.length > 0 && dw.length > 0) { const selectDw = dw[0] @@ -733,8 +604,6 @@ export default { } }, updates(type){ - - let selectRecords = this.$refs.xGrid.getCheckboxRecords() if(selectRecords.length>0){ @@ -752,17 +621,9 @@ export default { } }, - activeRowMethod({ row, rowIndex }){ - // if(row.zt==="01"){ - // return true - // }else{ - // return false - // } - return true; }, - initBase(){ getPgdBase({}).then(res=>{ this.zyqs=res.data.zyqs @@ -781,18 +642,12 @@ export default { } this.$refs.xGrid.updateData(this.list) } - }, saveclick(){ - if(this.queryParam.zt!=='02'){ return } let obj=this.$refs.xGrid.getCheckboxRecords() - // if(obj.length===0){ - // this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' }) - // return - // } saveDmPgdFk(obj).then(res=>{ if(res.success){ this.initList() @@ -801,44 +656,37 @@ export default { }, slpgclick(){ - // if(this.queryParam.zt!=="01"){ - // return - // } - let obj=this.$refs.xGrid.getCheckboxRecords() if(obj.length===0){ return } - if (this.queryParam.zt==='01') { - this.$confirm('保存？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() =>{ - let selectRecords = this.$refs.xGrid.getCheckboxRecords() - const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy) - if (dw.length > 0) { - const selectDw = dw[0] - if (!selectDw.dcCh && !selectDw.dcPl && !selectDw.dcFd) { - selectDw.dcCh = selectRecords[0].czbh - selectDw.dcPl = selectRecords[0].pl - selectDw.dcFd = selectRecords[0].fd - saveBfwz({edit:[selectDw]}).then(res=>{}) - } - } - saveDmppxxb(obj).then(res=>{ - if(res.success){ - this.initList() + if (this.queryParam.zt==='01') { + this.$confirm('保存？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() =>{ + let selectRecords = this.$refs.xGrid.getCheckboxRecords() + const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy) + if (dw.length > 0) { + const selectDw = dw[0] + if (!selectDw.dcCh && !selectDw.dcPl && !selectDw.dcFd) { + selectDw.dcCh = selectRecords[0].czbh + selectDw.dcPl = selectRecords[0].pl + selectDw.dcFd = selectRecords[0].fd + saveBfwz({edit:[selectDw]}).then(res=>{}) + } } - }) + saveDmppxxb(obj).then(res=>{ + if(res.success){ + this.initList() + } + }) - }) + }) } - - }, xdClick(){ - if(this.queryParam.zt!=="02"){ return } @@ -846,21 +694,6 @@ export default { if(obj.length===0){ return } - // if(this.queryParam.zt==='03'){ - // this.$confirm('取消接收？', '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() =>{ - // saveQgPgdXdBack(obj).then(res=>{ - // if(res.success){ - // this.$message({ message: '取消下达成功', type: 'success' }) - // this.initList() - // } - // }) - // - // }) - // }else { this.$confirm('接收？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -874,38 +707,30 @@ export default { }) }) - // } - - }, initList() { - // if (this.queryParam.dcch === '') { - // this.$message.warning('选择船只编号') - // return - // } + if (this.queryParam.dcch === '') { + this.$message.warning('选择船只编号') + return + } getDmppxxbList(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { this.$refs.xGrid.loadData(this.list) } - }) }, selectChange(row) { - // this.$refs.xGrid.clearActived() // 清除单元格激活状态 this.$refs.xGrid.clearEdit() // 清除单元格激活状态 - // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态 null2str(row.row) }, getHeight() { this.height = window.innerHeight - 190 }, - } }