diff --git a/src/permission.js b/src/permission.js index aedfe6d..0b6b2ca 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','/ljian'] // no redirect whitelist +const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk','/ljian','baogong'] // 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 21d6747..a19888a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -119,6 +119,11 @@ export const constantRoutes = [ component: () => import('@/views/zyjhzx/ljian/index'), hidden: true }, + { + path: '/baogong', + component: () => import('@/views/zyjhzx/ljian/baogong'), + hidden: true + }, { path: '/login', component: () => import('@/views/login/index'), diff --git a/src/views/jhzx/qfqrGL.vue b/src/views/jhzx/qfqrGL.vue index 984d775..c5f64c2 100644 --- a/src/views/jhzx/qfqrGL.vue +++ b/src/views/jhzx/qfqrGL.vue @@ -300,10 +300,10 @@ export default { 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: '' } }], @@ -871,10 +871,10 @@ 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) { diff --git a/src/views/jhzxgl/components/GxsqAdd.vue b/src/views/jhzxgl/components/GxsqAdd.vue index 404a138..33f9dc9 100644 --- a/src/views/jhzxgl/components/GxsqAdd.vue +++ b/src/views/jhzxgl/components/GxsqAdd.vue @@ -464,10 +464,10 @@ }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } selectQmByQgAndJh(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/components/GxsqAdddm.vue b/src/views/jhzxgl/components/GxsqAdddm.vue index 5c3ac56..cbf6b44 100644 --- a/src/views/jhzxgl/components/GxsqAdddm.vue +++ b/src/views/jhzxgl/components/GxsqAdddm.vue @@ -464,10 +464,10 @@ }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } selectQmByQgAndJh(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/components/GxsqAddpk.vue b/src/views/jhzxgl/components/GxsqAddpk.vue index 23bfc8f..1151334 100644 --- a/src/views/jhzxgl/components/GxsqAddpk.vue +++ b/src/views/jhzxgl/components/GxsqAddpk.vue @@ -464,10 +464,10 @@ }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } selectQmByQgAndJh(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/components/YlxxAdd.vue b/src/views/jhzxgl/components/YlxxAdd.vue index 404a138..33f9dc9 100644 --- a/src/views/jhzxgl/components/YlxxAdd.vue +++ b/src/views/jhzxgl/components/YlxxAdd.vue @@ -464,10 +464,10 @@ }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } selectQmByQgAndJh(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/dhqdFK.vue b/src/views/jhzxgl/dhqdFK.vue index f3b090f..ff5b314 100644 --- a/src/views/jhzxgl/dhqdFK.vue +++ b/src/views/jhzxgl/dhqdFK.vue @@ -403,10 +403,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getDhPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue index 4023dc0..991b391 100644 --- a/src/views/jhzxgl/dmjhD.vue +++ b/src/views/jhzxgl/dmjhD.vue @@ -300,10 +300,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'ljmc', title: '零件名称', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ljmc', title: '零件名称', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'ljgg', title: '零件规格', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -813,10 +813,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getQmPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/dmjhFK.vue b/src/views/jhzxgl/dmjhFK.vue index c0becfd..9ea7116 100644 --- a/src/views/jhzxgl/dmjhFK.vue +++ b/src/views/jhzxgl/dmjhFK.vue @@ -242,10 +242,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'ljmc', title: '零件名称', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ljmc', title: '零件名称', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'ljgg', title: '零件规格', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -452,10 +452,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getDmPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/hxjhD.vue b/src/views/jhzxgl/hxjhD.vue index 171a0cb..8a8aa14 100644 --- a/src/views/jhzxgl/hxjhD.vue +++ b/src/views/jhzxgl/hxjhD.vue @@ -200,10 +200,14 @@ export default { field:'', user:'', jhrqField:'', - zt:'42', + zt:'11', qgkw:'' }, statusOptions: [ + { + value: "11", + label: "已打印", + }, { value: "42", label: "未派工", diff --git a/src/views/jhzxgl/pkjhD.vue b/src/views/jhzxgl/pkjhD.vue index 3191afb..d38e5bc 100644 --- a/src/views/jhzxgl/pkjhD.vue +++ b/src/views/jhzxgl/pkjhD.vue @@ -301,10 +301,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'ljmc', title: '零件名称', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ljmc', title: '零件名称', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'ljgg', title: '零件规格', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -804,10 +804,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getQmPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/pkjhFK.vue b/src/views/jhzxgl/pkjhFK.vue index 36aa391..d5d7109 100644 --- a/src/views/jhzxgl/pkjhFK.vue +++ b/src/views/jhzxgl/pkjhFK.vue @@ -249,10 +249,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'ljmc', title: '零件名称', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ljmc', title: '零件名称', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'ljgg', title: '零件规格', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -508,10 +508,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getPkPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue index 3a6d7c4..640dc9d 100644 --- a/src/views/jhzxgl/pwjhD.vue +++ b/src/views/jhzxgl/pwjhD.vue @@ -202,12 +202,16 @@ export default { field:'', user:'', jhrqField:'', - zt:'21', + zt:'11', qgkw:'' }, zyqs:[], zyrys:[], statusOptions: [ + { + value: "11", + label: "已打印", + }, { value: "21", label: "未派工", diff --git a/src/views/jhzxgl/pwjhFK.vue b/src/views/jhzxgl/pwjhFK.vue index 3cf5881..76a445b 100644 --- a/src/views/jhzxgl/pwjhFK.vue +++ b/src/views/jhzxgl/pwjhFK.vue @@ -458,10 +458,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getPwPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue index 5753a44..976c7ff 100644 --- a/src/views/jhzxgl/qgjhD.vue +++ b/src/views/jhzxgl/qgjhD.vue @@ -192,12 +192,16 @@ export default { field:'', user:'', jhrqField:'', - zt:'42', + zt:'11', ztHx:'52' }, zyqs:[], zyrys:[], statusOptions: [ + { + value: "11", + label: "已打印", + }, { value: "42", label: "未派工", diff --git a/src/views/jhzxgl/qgjhFK.vue b/src/views/jhzxgl/qgjhFK.vue index f242ce2..9fd3496 100644 --- a/src/views/jhzxgl/qgjhFK.vue +++ b/src/views/jhzxgl/qgjhFK.vue @@ -498,10 +498,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getQgPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue index 555c579..2d69d36 100644 --- a/src/views/jhzxgl/qmjhD.vue +++ b/src/views/jhzxgl/qmjhD.vue @@ -299,10 +299,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'ljmc', title: '零件名称', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ljmc', title: '零件名称', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'ljgg', title: '零件规格', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -800,10 +800,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getQmPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/qmjhFK.vue b/src/views/jhzxgl/qmjhFK.vue index 78c8b26..cd3b048 100644 --- a/src/views/jhzxgl/qmjhFK.vue +++ b/src/views/jhzxgl/qmjhFK.vue @@ -240,10 +240,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'ljmc', title: '零件名称', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ljmc', title: '零件名称', width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'ljgg', title: '零件规格', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -482,10 +482,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getQmPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue index 470193c..79a1639 100644 --- a/src/views/jhzxgl/sljhD.vue +++ b/src/views/jhzxgl/sljhD.vue @@ -542,7 +542,14 @@ export default { tableColumn1: [ { type: 'checkbox', width: 40 }, { type: 'seq', width: 40, title: '序号' }, // 1 - // { title: '操作', width: 50, slots: { default: 'operation' }, fixed: 'right' }, + { + title: '合同号', + width: "120px", + field: 'dcFd', + + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' }, + }, { title: '小合同号', width: "120px", @@ -738,14 +745,6 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination' }, }, - { - title: '合同号', - width: "120px", - field: 'dcFd', - - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, - }, { title: '生产id', width: "120px", diff --git a/src/views/jhzxgl/sljhFK.vue b/src/views/jhzxgl/sljhFK.vue index 16a142d..b725774 100644 --- a/src/views/jhzxgl/sljhFK.vue +++ b/src/views/jhzxgl/sljhFK.vue @@ -469,10 +469,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getSljhPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/tzjhFK.vue b/src/views/jhzxgl/tzjhFK.vue index 48c865c..c90b548 100644 --- a/src/views/jhzxgl/tzjhFK.vue +++ b/src/views/jhzxgl/tzjhFK.vue @@ -389,10 +389,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getTzjhPgd(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/jhzxgl/ylxx.vue b/src/views/jhzxgl/ylxx.vue index fd22c3b..28479fd 100644 --- a/src/views/jhzxgl/ylxx.vue +++ b/src/views/jhzxgl/ylxx.vue @@ -655,10 +655,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getYlList(this.queryParam).then((res) => { console.log(res.data) this.list = res.data diff --git a/src/views/jhzxgl/yppCX.vue b/src/views/jhzxgl/yppCX.vue index 744f592..bcbb480 100644 --- a/src/views/jhzxgl/yppCX.vue +++ b/src/views/jhzxgl/yppCX.vue @@ -326,10 +326,10 @@ export default { 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: '' } }], @@ -880,10 +880,10 @@ 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) { diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue index d81343a..c63010f 100644 --- a/src/views/jhzxgl/yppFK.vue +++ b/src/views/jhzxgl/yppFK.vue @@ -300,10 +300,10 @@ export default { 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: '' } }], @@ -862,10 +862,10 @@ 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) { diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue index ab55069..addd408 100644 --- a/src/views/jhzxgl/yppGL.vue +++ b/src/views/jhzxgl/yppGL.vue @@ -318,10 +318,10 @@ export default { 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: '' } }], @@ -872,10 +872,10 @@ 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) { diff --git a/src/views/sjfx/sygdFX.vue b/src/views/sjfx/sygdFX.vue index f035461..37fcef3 100644 --- a/src/views/sjfx/sygdFX.vue +++ b/src/views/sjfx/sygdFX.vue @@ -1,6 +1,6 @@ @@ -11,7 +11,9 @@ export default { name: "SygdFX", components: {DataView}, data() { - return {} + return { + url:process.env.VUE_APP_KBAN + } }, created() { }, diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue index aa164b8..040b06c 100644 --- a/src/views/sjzx/bclqCX.vue +++ b/src/views/sjzx/bclqCX.vue @@ -436,10 +436,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getBcLQlList(this.queryParam).then((res) => { //this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/sjzx/bclqCX1.vue b/src/views/sjzx/bclqCX1.vue index 13d9cc4..03355f1 100644 --- a/src/views/sjzx/bclqCX1.vue +++ b/src/views/sjzx/bclqCX1.vue @@ -681,10 +681,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getBcLQlList(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/sjzx/bctltCX.vue b/src/views/sjzx/bctltCX.vue index f9d64f4..92f247b 100644 --- a/src/views/sjzx/bctltCX.vue +++ b/src/views/sjzx/bctltCX.vue @@ -388,10 +388,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getTLTList(this.queryParam).then((res) => { this.list = res.data diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue index 1d23a51..86ac547 100644 --- a/src/views/sjzx/bcybCX.vue +++ b/src/views/sjzx/bcybCX.vue @@ -380,10 +380,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getBcTJlList(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/sjzx/bomcx.vue b/src/views/sjzx/bomcx.vue index f266535..8efd590 100644 --- a/src/views/sjzx/bomcx.vue +++ b/src/views/sjzx/bomcx.vue @@ -752,10 +752,10 @@ export default { }, bomClick(){ - if (this.queryParam.cbbm === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.cbbm === '') { + // this.$message.warning('选择船只编号') + // return + // } addListBom(this.queryParam).then(res=>{ this.tableData=res.data; @@ -776,10 +776,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getListBomRealy(this.queryParam).then((res) => { this.list = res.data diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue index a80d153..95cb92e 100644 --- a/src/views/sjzx/bomwh.vue +++ b/src/views/sjzx/bomwh.vue @@ -1248,10 +1248,10 @@ export default { }, bomClick(){ - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } addListBom(this.queryParam).then(res=>{ this.tableData=res.data; @@ -1289,10 +1289,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getListBom(this.queryParam).then((res) => { this.list = res.data diff --git a/src/views/sjzx/bomxg.vue b/src/views/sjzx/bomxg.vue index 01b1705..f8edc05 100644 --- a/src/views/sjzx/bomxg.vue +++ b/src/views/sjzx/bomxg.vue @@ -516,10 +516,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getListBomRealy(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/sjzx/components/SelectBom.vue b/src/views/sjzx/components/SelectBom.vue index 66653e3..f6ff1b5 100644 --- a/src/views/sjzx/components/SelectBom.vue +++ b/src/views/sjzx/components/SelectBom.vue @@ -706,10 +706,10 @@ export default { }, bomClick(){ - if (this.queryParam.cbbm === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.cbbm === '') { + // this.$message.warning('选择船只编号') + // return + // } addListBom(this.queryParam).then(res=>{ this.tableData=res.data; @@ -733,10 +733,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getListBomRealy1(this.queryParam).then((res) => { this.list = res.data diff --git a/src/views/sjzx/czbhcx.vue b/src/views/sjzx/czbhcx.vue index d738e53..63d9ad1 100644 --- a/src/views/sjzx/czbhcx.vue +++ b/src/views/sjzx/czbhcx.vue @@ -177,15 +177,15 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ckxszt', title: '库存系统显示标识', width: 120, editRender: { }, - slots:{ - // - edit:'ckxsztEdit', - default: 'ckxsztEdit' - }, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'ckxszt', title: '库存系统显示标识', width: 120, editRender: { }, + // slots:{ + // // + // edit:'ckxsztEdit', + // default: 'ckxsztEdit' + // }, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'cjs', title: '船级社', width: 120, editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -251,15 +251,15 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'cwfzbs', title: '财务封账标识', width: 120, editRender: { }, - slots:{ - // - edit:'cwfzbsEdit', - default: 'cwfzbsEdit' - }, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + // { field: 'cwfzbs', title: '财务封账标识', width: 120, editRender: { }, + // slots:{ + // // + // edit:'cwfzbsEdit', + // default: 'cwfzbsEdit' + // }, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, { field: 'bz', title: '备注', width: 120, editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, diff --git a/src/views/sjzx/ljptCX.vue b/src/views/sjzx/ljptCX.vue index 8daf15e..034f2b7 100644 --- a/src/views/sjzx/ljptCX.vue +++ b/src/views/sjzx/ljptCX.vue @@ -379,10 +379,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getLJQDList(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/sjzx/xclqCX.vue b/src/views/sjzx/xclqCX.vue index 7f7aab3..5d8b132 100644 --- a/src/views/sjzx/xclqCX.vue +++ b/src/views/sjzx/xclqCX.vue @@ -462,10 +462,10 @@ export default { ] }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getBcLQlList(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/sjzx/xctltCX.vue b/src/views/sjzx/xctltCX.vue index afa02e8..f9020f6 100644 --- a/src/views/sjzx/xctltCX.vue +++ b/src/views/sjzx/xctltCX.vue @@ -388,10 +388,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getTLTList(this.queryParam).then((res) => { this.list = res.data diff --git a/src/views/sjzx/xcylCX.vue b/src/views/sjzx/xcylCX.vue index 07dae97..b16f3e3 100644 --- a/src/views/sjzx/xcylCX.vue +++ b/src/views/sjzx/xcylCX.vue @@ -353,10 +353,10 @@ export default { }) }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } getBcTJlList(this.queryParam).then((res) => { this.list = res.data if (this.$refs.xGrid) { diff --git a/src/views/tp/czfdzgtcx.vue b/src/views/tp/czfdzgtcx.vue index 9ca0598..4bc5114 100644 --- a/src/views/tp/czfdzgtcx.vue +++ b/src/views/tp/czfdzgtcx.vue @@ -161,447 +161,514 @@ export default { // tableData: [], tableColumnMx: [ - { type: 'seq', width: 60, title: '序号' }, - { field: 'jhqh', title: '计划期号', width: 100 , + { 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' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'czbh', title: '船只编号', width: 90 , - + { field: 'czbh', title: '船号', width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zyjd', title: '作业阶段', width: 90 ,formatter: ['dictXtFormat','ZYJD'], + { field: 'pl', title: '批量', width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'fdh', title: '分段号', width: 80 , + { field: 'fd', title: '分段', width: 90, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tpbh', title: '托盘表号', width: 110 , + { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'hh', title: '行号', width: 80 , + { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'azth', title: '安装图号', width: 100 , + { field: 'tlth', title: '套料图号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zztph', title: '批号/卡号', width: 80 , + + + { field: 'ljbh', title: '零件编号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzth', title: '制作图号', width: 110 , + // { 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' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zztmc', title: '制作图名称', width: 150 , + { field: 'ljcz', title: '零件材质', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'bjdh', title: '部件号', width: 80 , + { field: 'wpfl', title: '物品分类', width: 60, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'bjmc', title: '部件名称', width: 100 , + { field: 'jldw', title: '计量单位', width: 60, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'wpgg', title: '规格+型号+材质', width: 210 , + { field: 'sl', title: '数量', width: 70, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhxqrq', title: '集团三月滚动计划期', width: 150 , - + { field: 'qfxqrqxz', title: '前方需求小组期', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'fdxqrq', title: '分段计划需求期', width: 150 , + + + { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'], + { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 , - + { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xqsl', title: '需求数量', width: 70 , + { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'bjzl', title: '单重', width: 80 , + { field: 'dzjz', title: '大组极重', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'bjzzl', title: '总重', width: 80 , - + { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xzjhrkrq', title: '舾装公司计划集配入库', width: 160 , - + { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zdcp', title: '重点产品', width: 100 , - + { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tplx', title: '部件分类', width: 100 ,formatter: ['dictFormat','TPLX'], - + { field: 'xdb', title: 'X大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'ygpprq', title: '预计配送期', width: 100 , - + { field: 'xskj', title: 'X数控件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'fkpprq', title: '反馈配送期', width: 150 , - + { field: 'xpt', title: 'X平铁', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xqtsc', title: '需求/反馈差距', width: 160 , - + { field: 'xyw', title: 'X压弯', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'fkwtsm', title: '反馈说明', width: 100 , - + { field: 'xxc', title: 'X型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'sscj', title: '所属车间', width: 100 ,formatter: ['dictFormat','BMBM'], - + { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhlx', title: '计划类型', width: 100 , - + { field: 'ddb', title: 'D大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhjtrq', title: '设计院计划发图日期', width: 150 , - + { field: 'dqb', title: 'D曲板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jtxqts', title: '需求发图天数差', width: 150 , - + { field: 'dxc', title: 'D型材T', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'sjltsj', title: '实际接图日期', width: 120 , - + { field: 'dsj', title: 'D散件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'ltxqts', title: '需求来图天数差', width: 130 , + { field: 'dgdh', title: '打磨工单号', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhxqrq_sq', title: '上期滚动计划需求日期', width: 160 , - + { field: 'dmsbbh', title: '打磨设备编号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhbgts', title: '变更天数', width: 120 , + { field: 'dmcd', title: '打磨打磨长度', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhxqrq_ls', title: '滚动计划需求期变更历史', width: 165 , - + { field: 'dmjhrq', title: '打磨计划日期', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmXfry', title: '打磨派工人', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, - { field: 'por_no', title: '采购需求编号', width: 120 , + { field: 'dmXfrq', title: '打磨派工日期', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'lc', title: '来处', width: 120 , + { field: 'dscry', title: '打磨生产人员', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_zt', title: '技术处理状态', width: 120 , + + { field: 'dmFkry', title: '打磨反馈人', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_gyspsj', title: '工艺审批时间', width: 120 , + { field: 'dmFkrq', title: '打磨反馈日期', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_cplx', title: '产品类型', width: 120 ,formatter: ['dictFormat','CPLX'], - + { field: 'pgdh', title: '坡口工单号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_clfs', title: '表面处理方式', width: 120 ,formatter: ['dictFormat','CLFS'], + { field: 'pkjhrq', title: '坡口计划日期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_bmcl', title: '表面处理', width: 120 ,formatter: ['dictFormat','CLFS'], + { field: 'pgdh', title: '坡口工单号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_ntzdm', title: '内表面涂装代码', width: 130 , + { field: 'pksbbh', title: '坡口设备编号', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zzt_wtzdm', title: '外表面涂装代码', width: 130 , + { field: 'pklx', title: '坡口类型', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xglx', title: '修改类型', width: 120 ,formatter: ['dictFormat','TPXG'], + { field: 'pkcd', title: '坡口长度', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xgph', title: '修改批号/卡号', width: 120 , - + { field: 'pkXfry', title: '坡口派工人员', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xgsj', title: '修改时间', width: 120 , + { field: 'pkXfrq', title: '坡口派工日期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xgtzdh', title: '修改通知单号', width: 140 , - + { field: 'pscry', title: '坡口生产人员', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'sc_zt', title: '制作状态', width: 120 , + { field: 'pkFkrq', title: '坡口反馈日期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'sgdw', title: '结构施工单位', width: 120 ,formatter: ['deptFormat'], - + { field: 'pkFkry', title: '坡口反馈人', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jgwgrq', title: '结构实际完工日期', width: 140 , + { field: 'qgdh', title: ' 曲工单号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tzdw', title: '表面处理单位', width: 120 ,formatter: ['deptFormat'], + { field: 'qjgjhrq', title: '曲加工计划期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tzjsrq', title: '表面处理接收日期', width: 140 , + + { field: 'qsbbh', title: '曲设备编号', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tzwgrq', title: '表面处理时间完工日期', width: 140 , + + { field: 'qscry', title: '曲生产人员', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'scqkbz', title: '生产情况备注', width: 120 , + + { field: 'qjgXfry', title: '曲派工人员', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'psdw', title: '配送单位', width: 120 ,formatter: ['deptFormat'], + { field: 'qjgXfrq', title: '曲派工日期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jprkrq', title: '集配入库完工时间', width: 140 , + { field: 'qjgFkry', title: '曲反馈人', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'ps_zt', title: '配送状态', width: 120 , + { field: 'qjgFkrq', title: '曲反馈日期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'qfsqrq', title: '前方配送申请日期', width: 140 , + //------------------------------------------- + + // -------------------------------------------------------------- + + + { + field: 'slfkry', + title: '上料反馈人', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'qfxqrq', title: '前方实际需求期', width: 140 , - + { + field: 'slfkrq', + title: '上料反馈日期', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'qfpssl', title: '前方配送数量', width: 120 , - + { + field: 'pwfkry', + title: '抛丸反馈人', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'qfpswc', title: '配送完成情况', width: 120 , - + { + field: 'pwfkrq', + title: '抛丸反馈日期', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'qfpsrq', title: '实际配送日期', width: 120 , - + { + field: 'llfkry', + title: '理料反馈人', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'qfqrrq', title: '配送确认日期', width: 120 , - + { + field: 'llfkrq', + title: '理料反馈日期', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'psqkbz', title: '配送情况备注', width: 120 , + { + field: 'hxfkrq', + title: '划线反馈日期', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'jhdrry', title: '计划导入人员', width: 120 , - + { + field: 'hxfkry', + title: '划线反馈人员', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, - { field: 'jhdrrq', title: '计划导入日期', width: 120 , + { + field: 'qgfkry', + title: '切割反馈人', + width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination' } }, + { + field: 'qgfkrq', + 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' } + }, + + + ], tableColumnMain:[ + { type: 'checkbox', width: 50 }, { type: 'seq', width: 60, title: '序号' }, - - { field: 'czbh', title: '船只编号', width: 90 , - + { field: 'dcCh', title: '船只', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'fdh', title: '分段号', width: 80 , - slots: { default: 'fdh' }, + { field: 'dcPl', title: '批量', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tpbh', title: '托盘表号', width: 110 , - slots: { default: 'tpbh' }, + { field: 'zdh', title: '总段号', minWidth: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'], - + { field: 'dcFd', title: '分段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 , - + { field: 'dzjz', title: '大组极重', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'tplx', title: '物质类别', width: 110 ,formatter: ['dictFormat','TPLX'], - + { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'xqsl', title: '需求数量', width: 90 , - + { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'pssl', title: '配送数量', width: 90 ,formatter:['numberFormat','zero'], - + { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'psbfb', title: '实际配送率', width: 100 ,formatter:['numberFormat','percent',2], - + { field: 'xdb', title: 'X大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'pssl0', title: '按期配送率', width: 100 ,formatter:['numberFormat','percent',2], - + { field: 'xskj', title: 'X数控件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'pssl5', title: '预计5日配送率', width: 100 ,formatter:['numberFormat','percent',2], - + { field: 'xpt', title: 'X平铁', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'pssl10', title: '预计10日配送率', width: 100 ,formatter:['numberFormat','percent',2], - + { field: 'xyw', title: 'X压弯', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'pssl15', title: '预计15日配送率', width: 100 ,formatter:['numberFormat','percent',2], - + { field: 'xxc', title: 'X型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'qfxqrq', title: '前方实际需求期 ', width: 130 , - + { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'fdxqrq', title: '分段计划需求期', width: 130 , - + { field: 'ddb', title: 'D大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'jhxqrq', title: '集团计划需求期', width: 130 , - + { field: 'dqb', title: 'D曲板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'yjtgq', title: '预计提供期', width: 110 , - + { field: 'dxc', title: 'D型材T', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'sjpsrqmin', title: '配送开始期', width: 110 , - + { field: 'dsj', title: 'D散件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, }, - { field: 'sjpsrqmax', title: '配送结束期', width: 110 , - + { field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' }, + filterRender: { name: 'FilterCombination', }, + }, + { field: 'drcs', title: '导入次数', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xzglxqOld', title: '原需求期', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + }, + { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + { field: 'shrq', title: '审核日期', width: 110, editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + } ], activeName: 'first', tableDataMx: [ diff --git a/src/views/zl/czzjgz.vue b/src/views/zl/czzjgz.vue index a430c13..4fccfd4 100644 --- a/src/views/zl/czzjgz.vue +++ b/src/views/zl/czzjgz.vue @@ -219,13 +219,13 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination' } }, - { - field: 'WPMC', - title: '零件名称', - width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination' } - }, + // { + // field: 'WPMC', + // title: '零件名称', + // width: 120, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination' } + // }, { field: 'WPGG', title: '规格', @@ -523,10 +523,10 @@ export default { }, initList() { - if (this.queryParam.dcch === '') { - this.$message.warning('选择船只编号') - return - } + // if (this.queryParam.dcch === '') { + // this.$message.warning('选择船只编号') + // return + // } czzjList(this.queryParam).then((res) => { console.log(res.data) this.list = res.data diff --git a/src/views/zyjhzx/components/SelectComp.vue b/src/views/zyjhzx/components/SelectComp.vue index c093449..cc45fd3 100644 --- a/src/views/zyjhzx/components/SelectComp.vue +++ b/src/views/zyjhzx/components/SelectComp.vue @@ -1,12 +1,15 @@ @@ -16,7 +19,8 @@ export default { name:"ZyjhSelectComp", data(){ return { - zyRadioShow:true, + ljbs:false, + zyTypeWidth:'20%', data:{ zyType:'0', bzType:'01', @@ -26,12 +30,13 @@ export default { sliao:{path:''}, pwpg:{path:'/pwfk'}, pwfk:{path:'/pwpg'}, - llfk:{path:''}, + llfk:{path:'/'}, hxpg:{path:'/hxfk'}, hxfk:{path:'/hxpg'}, qgpg:{path:'/qgfk'}, qgfk:{path:'/qgpg'}, - ljian:{path:''} + ljian:{path:'/baogong'}, + baogong:{path:'/ljian'}, }, } }, @@ -39,8 +44,13 @@ export default { this.data.zyType=this.$route.query.zyType||'0' const path=this.$route.path.replace('/','') this.nextPath=this.nextPathName[path].path - if (path==='llfk'||path==='ljian'){ - this.zyRadioShow=false + if (path==='ljian'){ + this.zyTypeWidth='43%' + this.ljbs=true + } + if (path==='baogong'){ + this.zyTypeWidth='43%' + this.ljbs=true } }, methods:{ @@ -59,7 +69,46 @@ export default { diff --git a/src/views/zyjhzx/components/SliaoSearch.vue b/src/views/zyjhzx/components/SliaoSearch.vue index 8607811..6a522ab 100644 --- a/src/views/zyjhzx/components/SliaoSearch.vue +++ b/src/views/zyjhzx/components/SliaoSearch.vue @@ -1,13 +1,14 @@