From a473fafbb293ea4149368d87eb11a2fed6c450ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 16 Sep 2024 18:52:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96=202.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jhzx/sygd.js | 1 + src/permission.js | 2 +- src/router/index.js | 7 +- src/views/jhzx/ydjhzxGL.vue | 1249 +++---------- src/views/jhzx/ydjhzxGL1.vue | 1640 +++++++++++++++++ src/views/jhzx/ydjhzxXF.vue | 743 +------- src/views/jhzxgl/components/Yppfk0.vue | 2 +- src/views/zyjhzx/components/SelectComp.vue | 36 +- src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue | 1 + src/views/zyjhzx/hxianfkui/comps/dw.js | 31 +- src/views/zyjhzx/hxianfkui/comps/pgd.js | 4 +- src/views/zyjhzx/hxianfkui/comps/pgdTable.js | 2 +- src/views/zyjhzx/hxianfkui/index.vue | 70 +- .../zyjhzx/hxianpgong/comps/HxianPgd.vue | 10 +- src/views/zyjhzx/hxianpgong/comps/pgd.js | 4 +- src/views/zyjhzx/hxianpgong/comps/pgdTable.js | 2 +- src/views/zyjhzx/hxianpgong/index.vue | 2 +- src/views/zyjhzx/ljian/comps/HxianPgd.vue | 48 + src/views/zyjhzx/ljian/comps/baifang.js | 276 +++ src/views/zyjhzx/ljian/comps/container.js | 34 + src/views/zyjhzx/ljian/comps/dw.js | 156 ++ src/views/zyjhzx/ljian/comps/person.js | 152 ++ src/views/zyjhzx/ljian/comps/pgd.js | 505 +++++ src/views/zyjhzx/ljian/comps/pgdTable.js | 86 + src/views/zyjhzx/ljian/comps/sb.js | 41 + src/views/zyjhzx/ljian/comps/sljh.js | 280 +++ src/views/zyjhzx/ljian/comps/title.js | 40 + src/views/zyjhzx/ljian/index.vue | 216 +++ src/views/zyjhzx/lliaofkui/comps/pgd.js | 4 +- src/views/zyjhzx/lliaofkui/comps/pgdTable.js | 2 +- src/views/zyjhzx/lliaofkui/index.vue | 51 +- src/views/zyjhzx/lliaopgong/comps/pgd.js | 2 +- src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue | 1 + src/views/zyjhzx/pwanfkui/comps/dw.js | 34 +- src/views/zyjhzx/pwanfkui/comps/pgd.js | 4 +- src/views/zyjhzx/pwanfkui/comps/pgdTable.js | 2 +- src/views/zyjhzx/pwanfkui/index.vue | 71 +- src/views/zyjhzx/pwanpgong/comps/pgd.js | 4 +- src/views/zyjhzx/pwanpgong/comps/pgdTable.js | 2 +- src/views/zyjhzx/pwanpgong/index.vue | 37 +- src/views/zyjhzx/qgefkui/comps/QgePgd.vue | 1 + src/views/zyjhzx/qgefkui/comps/dw.js | 34 +- src/views/zyjhzx/qgefkui/comps/pgd.js | 4 +- src/views/zyjhzx/qgefkui/comps/pgdTable.js | 2 +- src/views/zyjhzx/qgefkui/index.vue | 75 +- src/views/zyjhzx/qgepgong/comps/QgePgd.vue | 11 +- src/views/zyjhzx/qgepgong/comps/pgd.js | 4 +- src/views/zyjhzx/qgepgong/comps/pgdTable.js | 3 +- src/views/zyjhzx/qgepgong/index.vue | 56 +- src/views/zyjhzx/sliao/comps/SliaoSearch.vue | 4 +- src/views/zyjhzx/sliao/comps/search.js | 20 +- 51 files changed, 4227 insertions(+), 1841 deletions(-) create mode 100644 src/views/jhzx/ydjhzxGL1.vue create mode 100644 src/views/zyjhzx/ljian/comps/HxianPgd.vue create mode 100644 src/views/zyjhzx/ljian/comps/baifang.js create mode 100644 src/views/zyjhzx/ljian/comps/container.js create mode 100644 src/views/zyjhzx/ljian/comps/dw.js create mode 100644 src/views/zyjhzx/ljian/comps/person.js create mode 100644 src/views/zyjhzx/ljian/comps/pgd.js create mode 100644 src/views/zyjhzx/ljian/comps/pgdTable.js create mode 100644 src/views/zyjhzx/ljian/comps/sb.js create mode 100644 src/views/zyjhzx/ljian/comps/sljh.js create mode 100644 src/views/zyjhzx/ljian/comps/title.js create mode 100644 src/views/zyjhzx/ljian/index.vue diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js index 2672310..0353c5f 100644 --- a/src/api/jhzx/sygd.js +++ b/src/api/jhzx/sygd.js @@ -18,3 +18,4 @@ export function ydjhxf(data) {return request({url: '/dmYdjh/xf', method: 'post', //采购计划到货情况 export function cgjhdhqk(data={}) {return request({url: '/dmSygdMx/cgjhdhqk', method: 'post',data})} +export function saveData(data={}) {return request({url: '/dmYdjh/save', method: 'post',data})} diff --git a/src/permission.js b/src/permission.js index 20e5263..aedfe6d 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk'] // no redirect whitelist +const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk','/ljian'] // no redirect whitelist export function flatRoutes(routes) { let ret = []; routes.forEach(it => { diff --git a/src/router/index.js b/src/router/index.js index c6b72e2..21d6747 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -113,7 +113,12 @@ export const constantRoutes = [ component: () => import('@/views/zyjhzx/qgefkui/index'), hidden: true }, - + //零件 + { + path: '/ljian', + component: () => import('@/views/zyjhzx/ljian/index'), + hidden: true + }, { path: '/login', component: () => import('@/views/login/index'), diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue index 655680e..80d3def 100644 --- a/src/views/jhzx/ydjhzxGL.vue +++ b/src/views/jhzx/ydjhzxGL.vue @@ -1,188 +1,83 @@ + diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue index 7505bff..c8a3995 100644 --- a/src/views/jhzx/ydjhzxXF.vue +++ b/src/views/jhzx/ydjhzxXF.vue @@ -56,160 +56,18 @@ {{row.dcCh}} + - - - @@ -254,11 +112,11 @@ export default { { field: 'dcCh', title: '船号',width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, - slots:{default:'ng'} + // slots:{default:'ng'} }, - { field: 'dcCh1', title: '目标船号',width: 90, - 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, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, @@ -277,6 +135,10 @@ export default { { field: 'jssj', title: '前方需求时间',width: 110, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, + { field: 'czplpNew.xfqTlt', title: '套料图下发日期', width: 150, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'slrq', title: '上料计划日期',width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, @@ -389,579 +251,6 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - - - { field: 'czplpNew.xfqTlt', title: '套料图下发日期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - - ], - tableColumn2: [ - { type: 'seq', width: 60, title: '序号',fixed: "left"}, - { field: 'tzzt', title: '图纸状态', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'czbh', title: '船号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pl', title: '批量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'fd', title: '分段', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'lqbxfrq', title: '领取表下发日期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'lqbjsrq', title: '领取表接收日期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'tltxfrq', title: '套料图下发日期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'tltjsrq', title: '套料图接收日期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qgxqrq', title: '切割需求日期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqxz', title: '前方需求小组期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqdz', title: '前方需求大组期', width: 150, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - - ], - tableColumn3:[ - { type: 'seq', width: 60, title: '序号',fixed: "left"}, - { field: 'czbh', title: '船号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dhqdh', title: '订货清单号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpcz', title: '物品材质', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'hd', title: '厚度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'kd', title: '宽度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'cd', title: '长度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'xqsl', title: '数量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'slxqrq', title: '上料需求日期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqxz', title: '前方需求小组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqdz', title: '前方需求大组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'hth', title: '合同号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'xhth', title: '小合同号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'dhsl', title: '到货数量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - ], - tableColumn4:[ - { type: 'seq', width: 60, title: '序号',fixed: "left"}, - { field: 'czbh', title: '船号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pl', title: '批量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'fd', title: '分段', width: 100, - 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: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'], - 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: 'wpgg', title: '规格', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpcz', title: '材质', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpzl', title: '重量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'hth', title: '合同号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'xhth', title: '小合同号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'lph', title: '炉批号/物料号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'kwh', title: '库存垛位', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'cs', title: '层数', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'jpbs', title: '校平标识', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'slfzry', title: '上料负责人', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'slwz', 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: 'qfxqrqxz', title: '前方需求小组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqdz', title: '前方需求大组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - ], - tableColumn5:[ - { type: 'seq', width: 60, title: '序号',fixed: "left"}, - { field: 'czbh', title: '船号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pl', title: '批量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'fd', title: '分段', width: 100, - 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: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'], - 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: 'wpgg', title: '规格', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpcz', title: '材质', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpzl', title: '重量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pwwz', 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: 'qfxqrqxz', title: '前方需求小组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqdz', title: '前方需求大组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'sljhwgrq', title: '上料计划完工期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pwfzr', title: '抛丸负责人', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'jpbs', title: '校平标识', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - ], - tableColumn6:[ - { type: 'seq', width: 60, title: '序号',fixed: "left"}, - { field: 'dcCh', title: '船号',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'dcPl', title: '批量',width: 80, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'tzbh', title: '套料图号',width: 90, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'wpgg', title: '规格',width: 80, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'jssj', title: '组立结束时间',width: 110, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'jzbs', title: '矫正标识',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'jzsb', title: '矫正设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }}, - { field: 'slrq', title: '上料计划日期',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - // { field: 'pw', title: '抛丸位置',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - { field: 'pwsb', title: '抛丸设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} } }, - { field: 'pwrq', title: '抛丸计划日期',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'hxcd', title: '划线长度(米)',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'hxcdKc', title: '划线空程长度(米)',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'hxsb', title: '划线设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }}, - { field: 'hxrq', title: '划线计划日期',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'qgcd', title: '切割长度（米)',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'qgcdKc', title: '切割空程长度（米)',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'qgsb', title: '切割设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }}, - { field: 'qgrq', title: '切割计划日期',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'pklx', title: '坡口类型',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'pkcd', title: '坡口长度',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'pksb', title: '坡口设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }}, - { field: 'pkrq', title: '坡口计划日期',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'qbs', title: '曲标识',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'qjgsb', title: '曲加工设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }}, - { field: 'qjgrq', 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: 'dmsb', title: '打磨设备',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }}, - { field: 'dmrq', title: '打磨计划日期',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'gjjsDz', title: '钢加大组结束',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'gjjsXz', title: '钢加小组结束',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'ljsl', title: '零件数量',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'gjks', title: '钢加开始',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'dcFd', title: '分段号',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'dcCh2', title: '本船号',width: 100, - 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: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'zt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'bcshzl', title: '重量',width: 80, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'wpxh', title: '材质',width: 80, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],}, - { field: 'xcms', title: '型材米数',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - { field: 'gxsj', title: '数据更新时间',width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, - ], - tableColumn7:[ - { type: 'seq', width: 60, title: '序号',fixed: "left"}, - { field: 'czbh', title: '船号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pl', title: '批量', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'fd', title: '分段', width: 100, - 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: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'], - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'], - 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: 'wpgg', title: '规格', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpcz', title: '材质', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'wpzl', 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: 'qfxqrqxz', title: '前方需求小组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qfxqrqdz', title: '前方需求大组期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qgfzry', title: '切割负责人', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'hxsbbh', title: '划线设备编号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'hxcd', title: '划线长度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'hxkccd', title: '划线空程长度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qgsbbh', title: '切割设备编号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qgcd', title: '切割长度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - - { field: 'qgkccd', title: '切割空程长度', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, ], } }, diff --git a/src/views/jhzxgl/components/Yppfk0.vue b/src/views/jhzxgl/components/Yppfk0.vue index 6993811..ee3cdda 100644 --- a/src/views/jhzxgl/components/Yppfk0.vue +++ b/src/views/jhzxgl/components/Yppfk0.vue @@ -21,7 +21,7 @@ - +
- + 派工 报工 @@ -16,13 +16,43 @@ export default { name:"ZyjhSelectComp", data(){ return { + zyRadioShow:true, data:{ zyType:'0', - bzType:'01' - } + bzType:'01', + }, + nextPath:'', + nextPathName: { + sliao:{path:''}, + pwpg:{path:'/pwfk'}, + pwfk:{path:'/pwpg'}, + llfk:{path:''}, + hxpg:{path:'/hxfk'}, + hxfk:{path:'/hxpg'}, + qgpg:{path:'/qgfk'}, + qgfk:{path:'/qgpg'}, + }, + } + }, + created(){ + this.data.zyType=this.$route.query.zyType||'0' + const path=this.$route.path.replace('/','') + this.nextPath=this.nextPathName[path].path + if (path==='llfk'){ + this.zyRadioShow=false } }, methods:{ + changePage(){ + this.$emit('clear') + this.$router.push(`${this.nextPath}?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) + // if (this.data.zyType==='0'){ + // this.$router.push(`/${this.nextPath}?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) + // } + // if (this.data.zyType==='1'){ + // this.$router.push(`/qgfk?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) + // } + }, init(){ this.$emit('initWorkers',this.data.bzType) }, diff --git a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue index 6657c19..47d44c8 100644 --- a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue +++ b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue @@ -41,6 +41,7 @@ export default { window.localStorage.setItem("hxfk",JSON.stringify(data)) }, cellClick({row}){ + this.$emit('pgdClick',row) this.$emit('initPgd',row) } } diff --git a/src/views/zyjhzx/hxianfkui/comps/dw.js b/src/views/zyjhzx/hxianfkui/comps/dw.js index 1bfaf28..cb5efc9 100644 --- a/src/views/zyjhzx/hxianfkui/comps/dw.js +++ b/src/views/zyjhzx/hxianfkui/comps/dw.js @@ -61,17 +61,7 @@ export default function (width,height,callback){ height:height }) group.on('click touchstart',function (){ - if (selectedShape){ - selectedShape.hide() - if (selectedShape===selectShape){ - selectedShape=null - callback(null,null) - return - } - } - selectedShape=selectShape - selectedShape.show() - callback(index,item) + selected() }) const bgObj = new Image(); @@ -89,9 +79,26 @@ export default function (width,height,callback){ shape.zIndex(0) } + let selectShape=null + function selected(){ + if (selectedShape){ + selectedShape.hide() + if (selectedShape===selectShape){ + selectedShape=null + callback(null,null) + return + } + } + selectedShape=selectShape + selectedShape.show() + callback(index,item) + } + + group.selected=selected + const selectObj = new Image(); selectObj.src = require('@/assets/sliao/selected.png'); - let selectShape=null + const setSelectShape=function (shape){ selectShape=shape } diff --git a/src/views/zyjhzx/hxianfkui/comps/pgd.js b/src/views/zyjhzx/hxianfkui/comps/pgd.js index d3114c9..72db9c8 100644 --- a/src/views/zyjhzx/hxianfkui/comps/pgd.js +++ b/src/views/zyjhzx/hxianfkui/comps/pgd.js @@ -79,7 +79,7 @@ export default function (width,height){ lineHeight:1, fill:'#fff', strokeWidth:1, - text:'抛丸施工单', + text:'划线计划单', align:'center', fontSize:20, }) @@ -91,7 +91,7 @@ export default function (width,height){ width:_width-48, height:15, fill:'#fff', - text:`单号:${data.djh?'HX'+data.djh:''}`, + text:`单号:${data.djh}`, align:'left', fontSize:12, }) diff --git a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js index 3bcdc3b..0d2176d 100644 --- a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js +++ b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js @@ -48,7 +48,7 @@ export default function () { const columns = [ { type: 'checkbox', width: 40 }, { type: 'seq',title:'序号', width: 50 }, - { field: 'djh',title:'派工单号', width: 120,formatter: gdhFormat}, + { field: 'djh',title:'派工单号', width: 120,}, {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat}, {field: 'llcs', title: '层数', width: 60}, {field: 'dcCh', title: '船号', width: 80}, diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue index d90de14..cc93413 100644 --- a/src/views/zyjhzx/hxianfkui/index.vue +++ b/src/views/zyjhzx/hxianfkui/index.vue @@ -1,7 +1,8 @@ @@ -16,10 +17,11 @@ import baifang from "./comps/baifang"; import {getPgd, getYcldw} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue"; +import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; export default { name:'PWanFKui', - components: {HxianPgd}, + components: {ZyjhSelectComp, HxianPgd}, data(){ return { title:'划 线 作 业 报 工', @@ -38,7 +40,9 @@ export default { currentWorker:null, setWorkers:null, workers:null, - dwGroup:null + dwGroup:null, + workerGroup:null, + person:null, } }, mounted() { @@ -85,6 +89,39 @@ export default { const group=this.drawGd(pgd) this.pgdGroup.add(group) }, + pgdClick(option){ + let index=-1 + let dw=null + for (const item of this.dw) { + index+=1 + if ((item.id+'')===option.lldw){ + dw=item + } + } + this.dwGroup.children[index].selected() + + this.initDwInfo(index,dw) + const that=this + this.slGroup.children.forEach(item=>{ + const data=item.getAttr('item') + if (data.czbh===option.dcCh&&data.pl===option.dcPl&&data.fd===option.dcFd&&data.tlth===option.tzbh){ + const imageObj = new Image(); + imageObj.src = require('@/assets/pwan/gbSelectBg.png'); + imageObj.onload = function () { + const shape = new Konva.Image({ + x: 10, + y: 0, + offsetY:5, + width: that.width*0.32-20, + height:50, + image: this, + }); + item.add(shape) + shape.zIndex(0) + } + } + }) + }, initDwInfo(index,dw){ if (this.slGroup){ this.slGroup.destroyChildren() @@ -119,24 +156,30 @@ export default { } }) }, - initWorkers(){ - getBzryList({resourcesCode:'4KB002'}).then(res=>{ + initWorkers(bzType){ + if (this.workerGroup){ + this.workerGroup.destroyChildren() + }else{ const {container,person,getCurrentWorker}=workers(this.width,this.height) + this.person=person this.getCurrentWorker=getCurrentWorker const {bgGroup,group}=container() + this.workerGroup=group this.layer.add(bgGroup) - this.workers=res.data + } + getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ + this.workers=res.data this.setWorkers(res.data) const that=this for (let i=0;i diff --git a/src/views/zyjhzx/lliaofkui/comps/pgd.js b/src/views/zyjhzx/lliaofkui/comps/pgd.js index 6a10e76..e6cd2cc 100644 --- a/src/views/zyjhzx/lliaofkui/comps/pgd.js +++ b/src/views/zyjhzx/lliaofkui/comps/pgd.js @@ -79,7 +79,7 @@ export default function (width,height){ lineHeight:1, fill:'#fff', strokeWidth:1, - text:'抛丸施工单', + text:'理料计划单', align:'center', fontSize:20, }) @@ -91,7 +91,7 @@ export default function (width,height){ width:_width-48, height:15, fill:'#fff', - text:`单号:${data.djh?'LL'+data.djh:''}`, + text:`单号:${data.djh}`, align:'left', fontSize:12, }) diff --git a/src/views/zyjhzx/lliaofkui/comps/pgdTable.js b/src/views/zyjhzx/lliaofkui/comps/pgdTable.js index 3892c14..507f5c4 100644 --- a/src/views/zyjhzx/lliaofkui/comps/pgdTable.js +++ b/src/views/zyjhzx/lliaofkui/comps/pgdTable.js @@ -39,7 +39,7 @@ export default function () { const columns = [ { type: 'checkbox', width: 40 }, { type: 'seq',title:'序号', width: 60 }, - { field: 'djh',title:'派工单号', width: 120,formatter: gdhFormat}, + { field: 'djh',title:'派工单号', width: 120,}, {field: 'dcCh', title: '船号', width: 80}, {field: 'dcPl', title: '批量', width: 80}, {field: 'wpgg', title: '材质', width: 80}, diff --git a/src/views/zyjhzx/lliaofkui/index.vue b/src/views/zyjhzx/lliaofkui/index.vue index 8799754..0b13027 100644 --- a/src/views/zyjhzx/lliaofkui/index.vue +++ b/src/views/zyjhzx/lliaofkui/index.vue @@ -1,6 +1,7 @@ @@ -14,9 +15,11 @@ import baifang from "./comps/baifang"; import {sljh} from "@/views/zyjhzx/lliaofkui/comps/sljh"; import {getPgd, getYcldw, shangLiao} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; +import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; export default { name:'PWanFKui', + components: {ZyjhSelectComp}, data(){ return { title:'理 料 作 业 报 工', @@ -37,6 +40,8 @@ export default { setWorkers:null, workers:null, drawItem:null, + workerGroup:null, + person:null, kwBm:[ {"bmsm": "2跨超长超宽曲板", "bmlb": "QGKW", "bm": "10"}, {"bmsm": "2跨T型材腹板", "bmlb": "QGKW", "bm": "11"}, @@ -229,7 +234,7 @@ export default { },500) }) - qyGroup.on('touchend',function (){ + qyGroup.on('mouseup touchend',function (){ touchingFlag=false; this.draggable(false) _sljhGroup.draggable(true) @@ -255,31 +260,45 @@ export default { } }) }, - initWorkers(){ + initWorkers(bzType){ const that=this - getBzryList({resourcesCode:'4KB002'}).then(res=>{ + if (this.workerGroup){ + this.workerGroup.destroyChildren() + }else{ const {container,person,getCurrentWorker}=workers(this.width,this.height) + this.getCurrentWorker=getCurrentWorker + this.person=person const {bgGroup,group}=container() + this.workerGroup=group this.layer.add(bgGroup) - this.getCurrentWorker=getCurrentWorker + } + this.workerGroup.x(0) + this.workerGroup.y(0) + getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ this.workers=res.data that.setWorkers(res.data) for (let i=0;i{ - that.sljhItemList=res.data - that.drawSljhItem(res.data) - }) + // getPgd({field:'llry',user:item.userCode,zt:'41'}).then(res=>{ + // that.sljhItemList=res.data + // that.drawSljhItem(res.data) + // }) }) - group.add(worker) + this.workerGroup.add(worker) worker.zIndex(1) } }) }, + initSljhItem(){ + getPgd({zt:'32'}).then(res=>{ + this.sljhItemList=res.data + this.drawSljhItem(res.data) + }) + }, initKonvaStage(){ this.width=this.$refs.pwpg.clientWidth this.height=this.$refs.pwpg.clientHeight @@ -290,8 +309,6 @@ export default { const titel=drawTitle(this.width,this.height,this.title) this.layer.add(titel) - this.initWorkers() - this.initDw() const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height) @@ -306,6 +323,10 @@ export default { this.stage.add(sljhLayer) this.initBaiFang() + + this.initSljhItem() + + this.initWorkers(this.$refs.selRef.getData().bzType) }, kwNameFormat(code){ for (const item of this.kwBm) { @@ -320,11 +341,11 @@ export default {