xiaoning
/
gjerp_ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正

Browse Source
master
xhj 9 months ago
parent e86eba70ec
commit 94abb9c395
11 changed files with 4107 additions and 867 deletions
Show Stats Download Patch File Download Diff File

2
src/api/jhzxgl/ypp.js
Unescape View File

@ -19,6 +19,8 @@ export function saveBfwz(data={}) {return request({url: '/dwxx/addOrEdit', metho
export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})} export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})}
export function saveDmppxxb(data) {return request({url: '/dmPpxxb/saveDmppxxb', method: 'post', data})} export function saveDmppxxb(data) {return request({url: '/dmPpxxb/saveDmppxxb', method: 'post', data})}
export function saveDmppxxbpg(data) {return request({url: '/dmPpxxb/saveDmppxxbpg', method: 'post', data})}
export function saveDmppxxbqr(data) {return request({url: '/dmPpxxb/saveDmppxxbqr', method: 'post', data})}
export function getList(data) {return request({url: '/ypp/getList', method: 'post', data})} export function getList(data) {return request({url: '/ypp/getList', method: 'post', data})}

995
src/views/jhzx/qfqrGL.vue
View File

File diff suppressed because it is too large Load Diff

196
src/views/jhzx/ydjhzxGL.vue
Unescape View File

@ -667,55 +667,55 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } filterRender: { name: 'FilterCombination' }
}, },
{ // {
field: 'hxjybs', // field: 'hxjybs',
title: '划线借用标识', // title: '划线借用标识',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'hxjych', // field: 'hxjych',
title: '划线借用船号', // title: '划线借用船号',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'hxjypl', // field: 'hxjypl',
title: '划线借用批量', // title: '划线借用批量',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'hxjyfd', // field: 'hxjyfd',
title: '划线借用分段', // title: '划线借用分段',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'hxjyzl', // field: 'hxjyzl',
title: '划线借用组立', // title: '划线借用组立',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'hxjykw', // field: 'hxjykw',
title: '划线借用跨位', // title: '划线借用跨位',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'hxjytlth', // field: 'hxjytlth',
title: '划线借用套料图号', // title: '划线借用套料图号',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ {
field: 'hxbz', field: 'hxbz',
title: '划线备注', title: '划线备注',
@ -778,55 +778,55 @@ export default {
// 曲加工相关字段 // 曲加工相关字段
{ // {
field: 'qgjybs', // field: 'qgjybs',
title: '切割借用标识', // title: '切割借用标识',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'qgjych', // field: 'qgjych',
title: '切割借用船号', // title: '切割借用船号',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'qgjypl', // field: 'qgjypl',
title: '切割借用批量', // title: '切割借用批量',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'qgjyfd', // field: 'qgjyfd',
title: '切割借用分段', // title: '切割借用分段',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'qgjyzl', // field: 'qgjyzl',
title: '切割借用组立', // title: '切割借用组立',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'qgjykw', // field: 'qgjykw',
title: '切割借用跨位', // title: '切割借用跨位',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
{ // {
field: 'qgjytlth', // field: 'qgjytlth',
title: '切割借用套料图号', // title: '切割借用套料图号',
width: 100, // width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } // filterRender: { name: 'FilterCombination' }
}, // },
// 其他标识和计划日期字段 // 其他标识和计划日期字段
{ {

351
src/views/jhzxgl/dmjhD.vue
Unescape View File

@ -6,7 +6,7 @@
<el-form :inline="true" label-width="60px" label-position="left"> <el-form :inline="true" label-width="60px" label-position="left">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="20">
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange"> <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@ -60,12 +60,29 @@
<el-form-item label="分段:"> <el-form-item label="分段:">
<el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input> <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="套料图:">
<el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
</el-form-item>
<el-form-item label="跨位:">
<el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
<el-option
v-for="item in this.dictData.qgkw"
:key="item.bm"
:label="item.bmsm"
:value="item.bm"
>
</el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="initList">查询</el-button> <el-button type="success" @click="initList">查询</el-button>
</el-form-item> </el-form-item>
@ -83,25 +100,36 @@
<span style="width:6%" >班组:</span> <span style="width:6%" >班组:</span>
<el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick"> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
<el-option <el-option
v-for="item in this.dictData.bmbm" v-for="item in this.dictData.resourcesCodes"
:key="item.bm" :key="item.resourcesCode"
:label="item.bmsm" :label="item.resourcesCode"
:value="item.bm" :value="item.resourcesCode"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" > <span style="width:6%" >作业区:</span>
<el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
<el-option <el-option
v-for="item in this.dictData.gxry" v-for="item in this.dictData.zyqs"
:key="item.dlzh" :key="item.resourcesCode+item.zyq"
:label="item.dlzh" :label="item.resourcesCode+item.zyq"
:value="item.dlzh" :value="item.zyq"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
<el-option
v-for="item in this.dictData.zyrys"
:key="item.id"
:label="item.resourcesCode+item.zyq+item.userName"
:value="item.userName"
>
</el-option>
</el-select>
<el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨计划日期"/>
<el-button type="info" @click="updates2()" style="width: 5%">批量</el-button> <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
<!-- <span style="width:6%" >反馈人员:</span>--> <!-- <span style="width:6%" >反馈人员:</span>-->
<!-- <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />--> <!-- <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />-->
@ -157,7 +185,7 @@
<script> <script>
import { import {
saveDmPgdXd,getDmPgd,getPgdBase,saveDmPgdFk,saveDmPgdJs,saveDmPgdXdBack saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
} from '@/api/jhzxgl/pgd' } from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
@ -166,7 +194,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
name:'PwjhD', name:'Dmjhd',
data() { data() {
return { return {
queryParam: { queryParam: {
@ -174,7 +202,10 @@ export default {
pl:'', pl:'',
fd:'', fd:'',
fkyy:'', fkyy:'',
zt:'01' zt:'01',
'lx':'d',
qgkw:'',
tlth:'',
}, },
statusOptions: [ statusOptions: [
{ {
@ -197,8 +228,11 @@ export default {
sljs:'', sljs:'',
dw:'', dw:'',
scry:'', scry:'',
scdw:'' scdw:'',
zyq:''
}, },
zyqs:[],
zyrys:[],
list: [], list: [],
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
@ -218,189 +252,341 @@ export default {
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'lsh', title: '工单号', width: 100, { field: 'dgdh', title: '打磨工单号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmZt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
{ field: 'dmzt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'czbh', title: '船号', width: 100, { field: 'pl', title: '批量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'pl', title: '批量', width: 100, { field: 'fd', title: '分段', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'fd', title: '分段', width: 100, { field: 'kw', title: '跨位', width: 120,formatter: ['dictFormat', 'QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'kw', title: '跨位', width: 100, { field: 'zl', title: '组立', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'zl', title: '组立', width: 100, { field: 'tlth', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'tlth', title: '套料图号', width: 100,
{ field: 'ljbh', title: '零件编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ptblx', title: '套料图号', width: 100, { field: 'ljmc', title: '零件名称', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ljbh', title: '零件编号', width: 100, { field: 'ljgg', title: '零件规格', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ljmc', title: '零件名称', width: 100, { field: 'ljcz', title: '零件材质', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ljgg', title: '零件规格', width: 100, { field: 'wpfl', title: '物品分类', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ljcz', title: '零件材质', width: 100, { field: 'jldw', title: '计量单位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'wpfl', title: '物品分类', width: 100, { field: 'sl', title: '数量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'jldw', title: '计量单位', width: 100, { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'sl', title: '数量', width: 100, // { field: 'dgdh', title: '打磨工单号', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'dmsbbh', title: '打磨设备编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmcd', title: '打磨打磨长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dmjhrq', title: '打磨计划日期', width: 100, { field: 'dmjhrq', title: '打磨计划日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmXfry', title: '打磨派工人', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100, { field: 'dmXfrq', title: '打磨派工日期', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100, { field: 'dscry', title: '打磨生产人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
// { field: 'gylx', title: '工艺路线', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'dmfzry', title: '打磨负责人', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'dmsbbh', title: '打磨设备编号', width: 100, { field: 'dmFkry', title: '打磨反馈人', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmcd', title: '打磨长度', width: 100, { field: 'dmFkrq', title: '打磨反馈日期', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmXfry', title: '派工人', width: 100, { field: 'pgdh', title: '坡口工单号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmXfrq', title: '派工日期', width: 100, { field: 'pkjhrq', title: '坡口计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
// { field: 'dmry', title: '打磨人员', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], { field: 'pgdh', title: '坡口工单号', width: 100,
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'dmksrq', title: '打磨开始日期', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'dmjsrq', title: '打磨结束日期', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'dscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'dscry', title: '生产人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
// { field: 'djsry', title: '接收人员', width: 100,editRender: { name: 'input' }, { field: 'pksbbh', title: '坡口设备编号', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
// }, },
// { field: 'djsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'dmFkry', title: '反馈人', width: 100,editRender: { name: 'input' }, { field: 'pklx', title: '坡口类型', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmFkrq', title: '反馈日期', width: 100,editRender: { name: 'input' }, { field: 'pkcd', title: '坡口长度', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkXfry', title: '坡口派工人员', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmBzry', title: '编制人', width: 100, { field: 'pkXfrq', title: '坡口派工日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pscry', title: '坡口生产人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmBzrq', title: '编制日期', width: 100, { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkFkry', title: '坡口反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qgdh', title: ' 曲工单号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgjhrq', title: '曲加工计划期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qsbbh', title: '曲设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qscry', title: '曲生产人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgXfry', title: '曲派工人员', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgXfrq', title: '曲派工日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgFkry', title: '曲反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgFkrq', title: '曲反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
//-------------------------------------------
// --------------------------------------------------------------
{
field: 'slfkry',
title: '上料反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'slfkrq',
title: '上料反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'pwfkry',
title: '抛丸反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'pwfkrq',
title: '抛丸反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'llfkry',
title: '理料反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'llfkrq',
title: '理料反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'hxfkrq',
title: '划线反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'hxfkry',
title: '划线反馈人员',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'qgfkry',
title: '切割反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
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' }
},
@ -442,7 +628,13 @@ export default {
bzClick(){ bzClick(){
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
console.log(this.inParam.scdw) console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw) this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
console.log(this.dictData.zyqs)
},
bzClick1(){
console.log(this.dictData.zyrys)
console.log(this.zyrys)
this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
}, },
updates2(){ updates2(){
@ -454,6 +646,7 @@ export default {
selectRecords[i].dscdw = this.inParam.scdw selectRecords[i].dscdw = this.inParam.scdw
selectRecords[i].dscry = this.inParam.scry selectRecords[i].dscry = this.inParam.scry
selectRecords[i].dmjhrq = this.inParam.sljs
} }
@ -494,6 +687,8 @@ export default {
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data) console.log(res.data)
this.zyqs=res.data.zyqs
this.zyrys=res.data.zyrys
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm
@ -612,7 +807,7 @@ export default {
this.$message.warning('选择船只编号') this.$message.warning('选择船只编号')
return return
} }
getDmPgd(this.queryParam).then((res) => { getQmPgd(this.queryParam).then((res) => {
this.list = res.data this.list = res.data
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)

63
src/views/jhzxgl/hxjhD.vue
Unescape View File

@ -9,7 +9,7 @@
<el-col :span="22"> <el-col :span="22">
<el-col :span="5" > <el-col :span="5" >
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange"> <el-select v-model="queryParam.zt" placeholder="状态" @change="ztChange">
<el-option <el-option
v-for="item in statusOptions" v-for="item in statusOptions"
:key="item.value" :key="item.value"
@ -87,24 +87,34 @@
<span style="width:6%" >班组:</span> <span style="width:6%" >班组:</span>
<el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick"> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
<el-option <el-option
v-for="item in this.dictData.bmbm" v-for="item in this.dictData.resourcesCodes"
:key="item.bm" :key="item.resourcesCode"
:label="item.bmsm" :label="item.resourcesCode"
:value="item.bm" :value="item.resourcesCode"
>
</el-option>
</el-select>
<span style="width:6%" >作业区:</span>
<el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
<el-option
v-for="item in this.dictData.zyqs"
:key="item.resourcesCode+item.zyq"
:label="item.resourcesCode+item.zyq"
:value="item.zyq"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" > <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
<el-option <el-option
v-for="item in this.dictData.gxry" v-for="item in this.dictData.zyrys"
:key="item.dlzh" :key="item.id"
:label="item.dlzh" :label="item.resourcesCode+item.zyq+item.userName"
:value="item.dlzh" :value="item.userName"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -205,6 +215,8 @@ export default {
}, },
], ],
zyqs:[],
zyrys:[],
inParam:{ inParam:{
slry:'', slry:'',
slks:'', slks:'',
@ -232,6 +244,13 @@ export default {
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{
field: 'djh',
title: '单据号',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{ field: 'dcCh', title: '船号',width: 100, { field: 'dcCh', title: '船号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -310,22 +329,22 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } filterRender: { name: 'FilterCombination' }
}, },
{ {
field: 'hxry', field: 'hxfkry',
title: '划线人员', title: '划线反馈人员',
width: 100, width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } filterRender: { name: 'FilterCombination' }
}, },
{ {
field: 'hxfkry', field: 'hxry',
title: '划线反馈人员', title: '划线人员',
width: 100, width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' } filterRender: { name: 'FilterCombination' }
}, },
{ {
field: 'hxbz', field: 'hxbz',
title: '划线备注', title: '划线备注',
@ -373,7 +392,13 @@ export default {
bzClick(){ bzClick(){
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
console.log(this.inParam.scdw) console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw) this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
console.log(this.dictData.zyqs)
},
bzClick1(){
console.log(this.dictData.zyrys)
console.log(this.zyrys)
this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
}, },
updates2(){ updates2(){
@ -427,6 +452,8 @@ export default {
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data) console.log(res.data)
this.zyqs=res.data.zyqs
this.zyrys=res.data.zyrys
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm

10
src/views/jhzxgl/pwjhD.vue
Unescape View File

@ -9,7 +9,7 @@
<el-col :span="22"> <el-col :span="22">
<el-col :span="4" > <el-col :span="4" >
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange"> <el-select v-model="queryParam.zt" placeholder="状态" @change="ztChange">
<el-option <el-option
v-for="item in statusOptions" v-for="item in statusOptions"
:key="item.value" :key="item.value"
@ -245,7 +245,13 @@ export default {
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{
field: 'djh',
title: '单据号',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{ field: 'dcCh', title: '船号',width: 100, { field: 'dcCh', title: '船号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }}, filterRender: { name: 'FilterCombination', }},

51
src/views/jhzxgl/qgjhD.vue
Unescape View File

@ -9,7 +9,7 @@
<el-col :span="22"> <el-col :span="22">
<el-col :span="5" > <el-col :span="5" >
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange"> <el-select v-model="queryParam.zt" placeholder="状态" @change="ztChange">
<el-option <el-option
v-for="item in statusOptions" v-for="item in statusOptions"
:key="item.value" :key="item.value"
@ -83,24 +83,34 @@
<span style="width:6%" >班组:</span> <span style="width:6%" >班组:</span>
<el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick"> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
<el-option <el-option
v-for="item in this.dictData.bmbm" v-for="item in this.dictData.resourcesCodes"
:key="item.bm" :key="item.resourcesCode"
:label="item.bmsm" :label="item.resourcesCode"
:value="item.bm" :value="item.resourcesCode"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" > <span style="width:6%" >作业区:</span>
<el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
<el-option <el-option
v-for="item in this.dictData.gxry" v-for="item in this.dictData.zyqs"
:key="item.dlzh" :key="item.resourcesCode+item.zyq"
:label="item.dlzh" :label="item.resourcesCode+item.zyq"
:value="item.dlzh" :value="item.zyq"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
<el-option
v-for="item in this.dictData.zyrys"
:key="item.id"
:label="item.resourcesCode+item.zyq+item.userName"
:value="item.userName"
>
</el-option>
</el-select>
<el-button type="info" @click="updates2()" style="width: 5%">批量</el-button> <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
<!-- <span style="width:6%" >反馈人员:</span>--> <!-- <span style="width:6%" >反馈人员:</span>-->
@ -182,6 +192,8 @@ export default {
zt:'42', zt:'42',
ztHx:'52' ztHx:'52'
}, },
zyqs:[],
zyrys:[],
statusOptions: [ statusOptions: [
{ {
value: "42", value: "42",
@ -224,7 +236,13 @@ export default {
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{
field: 'djh',
title: '单据号',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{ field: 'dcCh', title: '船号',width: 100, { field: 'dcCh', title: '船号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }}, filterRender: { name: 'FilterCombination', }},
@ -339,6 +357,7 @@ export default {
}, },
methods: { methods: {
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
@ -362,7 +381,13 @@ export default {
bzClick(){ bzClick(){
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
console.log(this.inParam.scdw) console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw) this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
console.log(this.dictData.zyqs)
},
bzClick1(){
console.log(this.dictData.zyrys)
console.log(this.zyrys)
this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
}, },
updates2(){ updates2(){
@ -416,6 +441,8 @@ export default {
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data) console.log(res.data)
this.zyqs=res.data.zyqs
this.zyrys=res.data.zyrys
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm

315
src/views/jhzxgl/qmjhD.vue
Unescape View File

@ -6,7 +6,7 @@
<el-form :inline="true" label-width="60px" label-position="left"> <el-form :inline="true" label-width="60px" label-position="left">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="20">
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange"> <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@ -60,12 +60,30 @@
<el-form-item label="分段:"> <el-form-item label="分段:">
<el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input> <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="套料图:">
<el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
</el-form-item>
<el-form-item label="跨位:">
<el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
<el-option
v-for="item in this.dictData.qgkw"
:key="item.bm"
:label="item.bmsm"
:value="item.bm"
>
</el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button type="success" @click="initList">查询</el-button> <el-button type="success" @click="initList">查询</el-button>
</el-form-item> </el-form-item>
@ -83,25 +101,36 @@
<span style="width:6%" >班组:</span> <span style="width:6%" >班组:</span>
<el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick"> <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
<el-option <el-option
v-for="item in this.dictData.bmbm" v-for="item in this.dictData.resourcesCodes"
:key="item.bm" :key="item.resourcesCode"
:label="item.bmsm" :label="item.resourcesCode"
:value="item.bm" :value="item.resourcesCode"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" > <span style="width:6%" >作业区:</span>
<el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
<el-option <el-option
v-for="item in this.dictData.gxry" v-for="item in this.dictData.zyqs"
:key="item.dlzh" :key="item.resourcesCode+item.zyq"
:label="item.dlzh" :label="item.resourcesCode+item.zyq"
:value="item.dlzh" :value="item.zyq"
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
<el-option
v-for="item in this.dictData.zyrys"
:key="item.id"
:label="item.resourcesCode+item.zyq+item.userName"
:value="item.userName"
>
</el-option>
</el-select>
<el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="曲面计划日期"/>
<el-button type="info" @click="updates2()" style="width: 5%">批量</el-button> <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
<!-- <span style="width:6%" >反馈人员:</span>--> <!-- <span style="width:6%" >反馈人员:</span>-->
<!-- <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />--> <!-- <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%" />-->
@ -174,7 +203,10 @@ export default {
pl:'', pl:'',
fd:'', fd:'',
fkyy:'', fkyy:'',
zt:'01' zt:'01',
tlth:'',
'lx':'q',
qgkw:''
}, },
statusOptions: [ statusOptions: [
{ {
@ -196,8 +228,11 @@ export default {
sljs:'', sljs:'',
dw:'', dw:'',
scry:'', scry:'',
scdw:'' scdw:'',
zyq:''
}, },
zyqs:[],
zyrys:[],
list: [], list: [],
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
@ -217,7 +252,7 @@ export default {
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 40 }, { type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
{ field: 'lsh', title: '工单号', width: 100, { field: 'qgdh', title: ' 曲工单号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -240,7 +275,7 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'kw', title: '跨位', width: 120, { field: 'kw', title: '跨位', width: 120,formatter: ['dictFormat', 'QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -255,10 +290,7 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ptblx', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljbh', title: '零件编号', width: 120, { field: 'ljbh', title: '零件编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -304,78 +336,240 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'gylx', title: '工艺路线', width: 120, { field: 'qjgjhrq', title: '曲加工计划期', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgjhrq', title: '曲加工计划期', width: 120,
{ field: 'qsbbh', title: '曲设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgfzry', title: '曲加工负责人', width: 120,
{ field: 'qscry', title: '曲生产人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qsbbh', title: '曲设备编号', width: 120,
{ field: 'qjgXfry', title: '曲派工人员', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
// { field: 'qjgry', title: '曲加工人员', width: 120, { field: 'qjgXfrq', title: '曲派工日期', width: 120,editRender: { name: 'input' },
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
// }, },
//
// { field: 'qjgksrq', title: '曲加工开始日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
//
// { field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'qscdw', title: '生产单位', width: 100,editRender: { name: 'input' }, { field: 'qjgFkry', title: '曲反馈人', width: 120,editRender: { name: 'input' },
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'qscry', title: '生产人员', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgFkrq', title: '曲反馈日期', width: 120,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
//-------------------------------------------
{ field: 'pghd', title: '坡口工单号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkjhrq', title: '坡口计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qjgXfry', title: '派工人员', width: 120, { field: 'pksbbh', title: '坡口设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pklx', title: '坡口类型', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkcd', title: '坡口长度', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkXfry', title: '坡口派工人员', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkXfrq', title: '坡口派工日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pscry', title: '坡口生产人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkFkrq', title: '坡口反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkFkry', title: '坡口反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// --------------------------------------------------------------
{ field: 'dgdh', title: '打磨工单号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dmsbbh', title: '打磨设备编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgXfrq', title: '派工日期', width: 120, { field: 'dmcd', title: '打磨打磨长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dmXfry', title: '打磨派工人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgFkry', title: '反馈人', width: 120,editRender: { name: 'input' }, { field: 'dmXfrq', title: '打磨派工日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qjgFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' }, { field: 'dscry', title: '打磨生产人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'dmFkry', title: '打磨反馈人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dmFkrq', title: '打磨反馈日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{
field: 'slfkry',
title: '上料反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'slfkrq',
title: '上料反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'pwfkry',
title: '抛丸反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'pwfkrq',
title: '抛丸反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'llfkry',
title: '理料反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'llfkrq',
title: '理料反馈日期',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
// { field: 'qjgFkyy', title: '反馈原因', width: 120, {
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], field: 'hxfkrq',
// filterRender: { name: 'FilterCombination', }, title: '划线反馈日期',
// }, width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'hxfkry',
title: '划线反馈人员',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'qgfkry',
title: '切割反馈人',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
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' }
},
@ -393,13 +587,7 @@ export default {
}, },
methods: { methods: {
syncXiaochi(){
syncXiaochi().then(res=>{
if (res.success){
this.initList()
}
})
},
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
@ -423,7 +611,13 @@ export default {
bzClick(){ bzClick(){
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
console.log(this.inParam.scdw) console.log(this.inParam.scdw)
this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw) this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
console.log(this.dictData.zyqs)
},
bzClick1(){
console.log(this.dictData.zyrys)
console.log(this.zyrys)
this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
console.log(this.dictData.gxry) console.log(this.dictData.gxry)
}, },
updates2(){ updates2(){
@ -435,6 +629,7 @@ export default {
selectRecords[i].qscdw = this.inParam.scdw selectRecords[i].qscdw = this.inParam.scdw
selectRecords[i].qscry = this.inParam.scry selectRecords[i].qscry = this.inParam.scry
selectRecords[i].qjgjhrq = this.inParam.sljs
} }
@ -475,6 +670,8 @@ export default {
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase({}).then(res=>{
console.log(res.data) console.log(res.data)
this.zyqs=res.data.zyqs
this.zyrys=res.data.zyrys
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm
@ -515,7 +712,9 @@ export default {
if(obj.length===0){ if(obj.length===0){
return return
} }
console.log(this.queryParam.zt)
if(this.queryParam.zt==='02'){ if(this.queryParam.zt==='02'){
console.log(this.queryParam.zt)
this.$confirm('取消派工？', '提示', { this.$confirm('取消派工？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

999
src/views/jhzxgl/yppCX.vue
View File

File diff suppressed because it is too large Load Diff

982
src/views/jhzxgl/yppFK.vue
View File

File diff suppressed because it is too large Load Diff

978
src/views/jhzxgl/yppGL.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save