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

修正

Browse Source
master
xhj 5 months ago
parent d3ef71b317
commit 67800555cb
6 changed files with 186 additions and 24 deletions
Show Stats Download Patch File Download Diff File

26
src/store/modules/user.js
Unescape View File

@ -24,7 +24,7 @@ const mutations = {
state.name = name
},
SET_BMBM: (state, name) => {
state.BMBM = name
state.bmbm = name
},
SET_USERID: (state, name) => {
state.userID = name
@ -80,6 +80,30 @@ const actions = {
// commit('SET_ROLES', menu)
console.log(user)
if(user.bmbm==='FP1Q'){
user.bmbm='一区'
}
if(user.bmbm==='FP2Q'){
user.bmbm='二区'
}
if(user.bmbm==='FP3Q'){
user.bmbm='三区'
}
if(user.bmbm==='FP4Q'){
user.bmbm='四区'
}
if(user.bmbm==='FP5Q'){
user.bmbm='五区'
}
if(user.bmbm==='FP6Q'){
user.bmbm='六区'
}
commit('SET_NAME', user.yhms)
commit('SET_YHDM', user.yhdm)
commit('SET_BMBM', user.bmbm)

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

@ -88,7 +88,7 @@
<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" :disabled="flag">
<el-option
v-for="item in this.dictData.resourcesCodes"
:key="item.zyq"
@ -195,13 +195,15 @@ export default {
name:'HxjhD',
data() {
return {
flag:false,
queryParam: {
dcch:'',
field:'',
user:'',
jhrqField:'',
zt:'42',
qgkw:''
qgkw:'',
zyq1:''
},
statusOptions: [
{
@ -370,6 +372,10 @@ export default {
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()
console.log(this.bmbm)
console.log(this.name)
@ -410,6 +416,8 @@ export default {
this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
console.log(this.dictData.zyqs)
},
bzClick1(){
console.log(this.dictData.zyrys)
console.log(this.zyrys)
@ -472,6 +480,13 @@ export default {
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
if(this.bmbm.slice(-1)==='区'){
this.inParam.scdw=this.bmbm
this.flag=true;
this.bzClick()
}
})
},
plClick(){
@ -608,6 +623,7 @@ export default {
this.queryParam.user=this.name;
}
this.queryParam.zyq1=this.inParam.scdw
getPwPgd(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {

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

@ -54,20 +54,20 @@
</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-form-item label="分段:">-->
<!-- <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>-->
<!-- <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-form-item label="批量:">
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
</el-form-item>
@ -202,6 +202,7 @@ export default {
return {
queryParam: {
dcch:'',
dcpl:'',
field:'',
user:'',
jhrqField:'',
@ -224,7 +225,7 @@ export default {
label: "未报工",
},
{
value: "32",
value: "42",
label: "已报工",
},
@ -392,6 +393,7 @@ export default {
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()
console.log(this.bmbm)
},
methods: {
uploadExcel() {

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

@ -81,7 +81,7 @@
<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" :disabled="flag">
<el-option
v-for="item in this.dictData.resourcesCodes"
:key="item.zyq"
@ -189,13 +189,15 @@ export default {
name:'PwjhD',
data() {
return {
flag:false,
queryParam: {
dcch:'',
field:'',
user:'',
jhrqField:'',
zt:'42',
ztHx:'52'
ztHx:'52',
zyq1:'',
},
zyqs:[],
zyrys:[],
@ -492,6 +494,12 @@ export default {
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
if(this.bmbm.slice(-1)==='区'){
this.inParam.scdw=this.bmbm
this.flag=true;
this.bzClick()
}
})
},
plClick(){
@ -638,6 +646,7 @@ export default {
this.queryParam.user=this.name;
}
this.queryParam.zyq1=this.inParam.scdw
getPwPgd(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {

111
src/views/jhzxgl/sljhD.vue
Unescape View File

@ -98,6 +98,7 @@
<el-button type="success" @click="print()">打印</el-button>
<el-button type="success" @click="printzj()">直接打印</el-button>
<el-button type="success" @click="exportExcel()">导出</el-button>
<!-- <el-button type="success" @click="exportExcel1()">导出</el-button>-->
</el-col>
<!-- <el-col :span="10">-->
@ -236,6 +237,8 @@
<el-date-picker v-model="inParam.jhrq" value-format="yyyy/MM/dd" type="date" placeholder="计划日期"/>
<el-input v-model="inParam.bz" type="search" placeholder="备注" ></el-input>
<el-button type="info" @click="updates2()" >批量</el-button>
<el-button type="success" @click="exportExcel1()">抛丸导出</el-button>
</el-col>
<!-- <el-col :span="10">-->
@ -829,6 +832,107 @@ export default {
width: "120px",
field: 'ydid',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
],
tableColumn1Excel: [
{
title: '炉批号',
width: "70px",
field: 'lph',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '材质',
width: "80px",
field: 'wpxh',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '规格',
width: "120px",
field: 'wpgg',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '物品状态',
width: "70px",
field: 'wpzt',
formatter: ['dictFormat', 'WPZT'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '需求船只',
width: "70px",
field: 'zych',
editRender: {
name: '$select', options: [],
optionProps: {value: 'cbbm', label: 'cbbm'},
props: {clearable: true}
, events: {change: this.selectChange}
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '需求批量',
width: "70px",
field: 'zypl',
editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '流向',
width: "70px",
field: 'zylx', formatter: ['dictFormat', 'ZYLX'],
editRender: {
name: '$select', options: [],
optionProps: {value: 'bm', label: 'bmsm'},
props: {clearable: true}
, events: {change: this.selectChange}
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '切割跨位',
width: "80px",
field: 'sldw',
formatter: ['dictFormat', 'QGKW'],
editRender: {
name: '$select', options: [],
optionProps: {value: 'bm', label: 'bmsm'},
props: {clearable: true}
, events: {change: this.selectChange}
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '套料图号',
width: "70px",
field: 'dcth',
editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
{
title: '库存',
width: "50px",
field: 'kwh',
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' },
},
@ -849,6 +953,13 @@ export default {
exportExcel(){
exportByExcel(this.tableColumn1,this.$refs.xGrid.getTableData().visibleData,1,'上料派工单.xlsx')
},
exportExcel1(){
exportByExcel(this.tableColumn1Excel,this.$refs.xGrid.getTableData().visibleData,0,'上料派工单.xls')
},
cellClickEvent({row}) {
this.queryParam.xqdcch = row.cbbm
this.$refs.xDown4.hidePanel()

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

@ -263,6 +263,11 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{
field: 'ypph',
title: '虚拟托盘',
@ -270,11 +275,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{ field: 'czbh', title: '船号', width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },

Write Preview
Loading…
Cancel
Save