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

1.设备产能加字段：生产设备标识，跨位

Browse Source 
2.三月滚动排产页面字段，替换为excel月度下发列
3.三月滚动排产页面新增，三月滚动计划编制 ，并加上权限
master
xiaoning 1 year ago
parent 45d4d55254
commit 90b588ab41
7 changed files with 493 additions and 83 deletions
Show Stats Download Patch File Download Diff File

1
src/api/jhzx/sygd.js
Unescape View File

@ -17,3 +17,4 @@ export function ydjhxf(data) {return request({url: '/dmYdjh/xf', method: 'post',
//采购计划到货情况 //采购计划到货情况
export function cgjhdhqk(data={}) {return request({url: '/dmSygdMx/cgjhdhqk', method: 'post',data})} export function cgjhdhqk(data={}) {return request({url: '/dmSygdMx/cgjhdhqk', method: 'post',data})}

1
src/store/getters.js
Unescape View File

@ -13,6 +13,7 @@ const getters = {
zxtbm: state => state.user.zxtbm, zxtbm: state => state.user.zxtbm,
zxtmc: state => state.user.zxtmc, zxtmc: state => state.user.zxtmc,
bmbm: state => state.user.bmbm, bmbm: state => state.user.bmbm,
yhdm: state => state.user.yhdm,
cgdlm: state => state.user.cgdlm, cgdlm: state => state.user.cgdlm,
permission_routes: state => state.permission.routes, permission_routes: state => state.permission.routes,
errorLogs: state => state.errorLog.logs, errorLogs: state => state.errorLog.logs,

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

@ -6,6 +6,7 @@ const state = {
token: getToken(), token: getToken(),
name: '', name: '',
bmbm:'', bmbm:'',
yhdm:'',
userId:'', userId:'',
avatar: '', avatar: '',
introduction: '', introduction: '',
@ -33,6 +34,9 @@ const mutations = {
}, },
SET_ROLES: (state, roles) => { SET_ROLES: (state, roles) => {
state.roles = roles state.roles = roles
},
SET_YHDM: (state, yhdm) => {
state.yhdm = yhdm
} }
} }
@ -80,6 +84,7 @@ const actions = {
// commit('SET_ROLES', menu) // commit('SET_ROLES', menu)
console.log(user) console.log(user)
commit('SET_NAME', user.yhms) commit('SET_NAME', user.yhms)
commit('SET_YHDM', user.yhdm)
commit('SET_BMBM', user.bmbm) commit('SET_BMBM', user.bmbm)
commit('SET_ROLES',roles) commit('SET_ROLES',roles)
resolve(data) resolve(data)

420
src/views/jhzx/symxCX.vue
Unescape View File

@ -15,6 +15,7 @@
<el-col :span="9"> <el-col :span="9">
<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-button type="success" @click="initList1">查询1</el-button>-->
<el-button type="success" @click="save">保存</el-button> <el-button type="success" @click="save">保存</el-button>
<el-button type="success" @click="tqSygd">提交三月滚动</el-button> <el-button type="success" @click="tqSygd">提交三月滚动</el-button>
</el-form-item> </el-form-item>
@ -31,28 +32,69 @@
<el-button type="success" @click="symxhz">汇总</el-button> <el-button type="success" @click="symxhz">汇总</el-button>
<!-- <span style="font-size: 13px;color: red; float: right"> * 表中红色数据：钢料滚动需求期为休息日</span>--> <!-- <span style="font-size: 13px;color: red; float: right"> * 表中红色数据：钢料滚动需求期为休息日</span>-->
<vxe-grid <vxe-grid
id="id" id="id8"
ref="xGrid" ref="xGrid8"
border border
resizable resizable
keep-source keep-source
:align="'center'" :align="'center'"
:height="height" :height="height"
:auto-resize="true" :auto-resize="true"
:columns="tableColumn" :columns="tableColumn8"
:data="list" :span-method="rowspanMethod1"
highlight-current-row
:data="list8"
:custom-config="{ storage: true }" :custom-config="{ storage: true }"
:edit-config="{ highlight-hover-row
trigger: 'click', show-overflow
mode: 'row', show-header-overflow
showStatus: true, >
}" </vxe-grid>
@checkbox-all="selectAllEvent" <!-- <vxe-grid-->
@checkbox-change="selectChangeEvent" <!-- id="id"-->
<!-- ref="xGrid"-->
<!-- border-->
<!-- resizable-->
<!-- keep-source-->
<!-- :align="'center'"-->
<!-- :height="height"-->
<!-- :auto-resize="true"-->
<!-- :columns="tableColumn"-->
<!-- :data="list"-->
<!-- :custom-config="{ storage: true }"-->
<!-- :edit-config="{-->
<!-- trigger: 'click',-->
<!-- mode: 'row',-->
<!-- showStatus: true,-->
<!-- }"-->
<!-- @checkbox-all="selectAllEvent"-->
<!-- @checkbox-change="selectChangeEvent"-->
<!-- highlight-current-row-->
<!-- highlight-hover-row-->
<!-- show-overflow-->
<!-- :scroll-y="{enabled: true}"-->
<!-- >-->
<!-- </vxe-grid>-->
</div>
</el-tab-pane>
<el-tab-pane label="三月滚动计划编制" :disabled="this.isUser">
<div class="mytable">
<vxe-grid
id="id9"
ref="xGrid9"
border
resizable
keep-source
:align="'center'"
:height="height"
:auto-resize="true"
:columns="tableColumn9"
highlight-current-row highlight-current-row
:data="list1"
:custom-config="{ storage: true }"
highlight-hover-row highlight-hover-row
show-overflow show-overflow
:scroll-y="{enabled: true}" show-header-overflow
> >
</vxe-grid> </vxe-grid>
</div> </div>
@ -248,7 +290,7 @@
<script> <script>
import router from "@/router"; import router from "@/router";
import {getCzxx} from '@/api/jhzx/qfxq' import {getCzxx} from '@/api/jhzx/qfxq'
import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd' import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList, tqSygd1} from '@/api/jhzx/sygd'
import {mapGetters} from 'vuex' import {mapGetters} from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {getToken} from '@/utils/auth' import {getToken} from '@/utils/auth'
@ -260,6 +302,7 @@ export default {
components: {ScrollPane}, components: {ScrollPane},
data() { data() {
return { return {
isUser:true,
gcrl:[], gcrl:[],
dialogVisible: false, dialogVisible: false,
dialogVisible1: false, dialogVisible1: false,
@ -277,6 +320,7 @@ export default {
list1: [], list1: [],
list2: [], list2: [],
list3: [], list3: [],
list8: [],
checkedList: [], checkedList: [],
heads: {token: getToken()}, heads: {token: getToken()},
dictData: [], dictData: [],
@ -602,6 +646,22 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{
field: 'slsb', title: '上料计划设备', minWidth: "120",
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},
{ {
field: 'pwrq', title: '抛丸计划日期', minWidth: "120", field: 'pwrq', title: '抛丸计划日期', minWidth: "120",
filters: [{ filters: [{
@ -618,6 +678,22 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{
field: 'pwsb', title: '抛丸计划设备', minWidth: "120",
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},
{ {
field: 'hxrq', title: '划线计划日期', minWidth: "120", field: 'hxrq', title: '划线计划日期', minWidth: "120",
filters: [{ filters: [{
@ -634,6 +710,22 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{
field: 'hxsb', title: '划线计划设备', minWidth: "120",
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},
{ {
field: 'qgrq', title: '切割计划日期', minWidth: "120", field: 'qgrq', title: '切割计划日期', minWidth: "120",
filters: [{ filters: [{
@ -650,6 +742,22 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{
field: 'qgsb', title: '切割计划设备', minWidth: "120",
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},
// { // {
// field: 'jzsb', // field: 'jzsb',
// title: '矫正设备', // title: '矫正设备',
@ -2349,15 +2457,253 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
], ],
tableColumn8:[
{ type: 'checkbox', width: 50 ,},
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: 'dcCh', title: '船号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcPl', title: '批量号',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcFd', title: '分段号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'bs', title: '板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '上料', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xcpw', title: '型材抛丸', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pw', title: '抛丸', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'yklm', title: '一垮龙门板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'yksk', title: '一垮数控板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ykpkjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'eksk', title: '二垮数控板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ekskks', title: '数控切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ekpkjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sksk', title: '三垮数控板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skskqgks', title: '数控切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skpkjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skpt', title: '三垮平铁板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ptks', title: '平铁切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ptjs', title: '平铁切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qpt_zjs', title: '曲平铁转结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qptjs', title: '曲平铁结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qwbjs', title: '曲外板结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skbs', title: '数控 板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skqgks', title: '数控切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkqgjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'mbjb', title: '面板挤边', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qkxcms', title: '七垮型 材米数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xcmb', title: '型材 面板', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fdxq', title: '分段需求', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gdjs', title: '光电 结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bz', title: '备注', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
}
/*{ field: 'id', title: '流水号（禁止修改）',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},*/
],
tableColumn9:[
{ field: 'rq', title: '日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bb', title: '白班', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'yb', title: '夜班', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gw', title: '工位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wz', title: '位置', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gxde', title: '工序定额', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sbbm', title: '设备编码', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sbmc', title: '设备名称', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sbde', title: '设备定额', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ch', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批次', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xqrq', title: '钢板需求期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dzks', title: '小组开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dz', title: '大组', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'type', title: '类型（手工/数控）', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tzmc', title: '套料图名称', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tzbh', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpgg', title: '规格', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '材质', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '数量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'jglx', title: '加工路线', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'de', title: '定额', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zrc', title: '中日程', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
}
]
} }
}, },
computed: { computed: {
...mapGetters(['name', 'bmbm']) ...mapGetters(['name', 'bmbm','yhdm'])
}, },
created() { created() {
window.addEventListener('resize', this.getHeight) window.addEventListener('resize', this.getHeight)
this.getHeight() this.getHeight()
this.initBase() this.initBase()
if(this.yhdm=='user01'||this.yhdm=='user02'){
this.isUser=false
}
}, },
watch: { watch: {
'queryParam.beginTime'(newValue, Value){ 'queryParam.beginTime'(newValue, Value){
@ -2379,11 +2725,13 @@ export default {
//汇总 //汇总
symxhz() { symxhz() {
if (this.list.length < 1) { if (this.queryParam.beginTime=='' ||this.queryParam.endTime==''||
this.$message.warning('请先查询需要汇总的信息！'); this.queryParam.beginTime==null ||this.queryParam.endTime==null
) {
this.$message.warning('请先输入汇总的时间范围！');
return return
} }
symxhz(this.list).then((res) => { symxhz(this.queryParam).then((res) => {
if (res.data) { if (res.data) {
console.log(res.data) console.log(res.data)
this.list1 = res.data.xbList this.list1 = res.data.xbList
@ -2416,6 +2764,21 @@ export default {
} }
} }
}, },
rowspanMethod1({row, _rowIndex, column, visibleData}) {
//不要忘记在vxe-grid上配置 :scroll-y="{enabled: false}" 防止下拉时样式变化
// 需要合并的列字段
let fields = ['dcCh','dcPl'];// 需要合并的列
const cellValue = row[column.property];// 合并行的相同的唯一标识
if (cellValue && fields.includes(column.property)) {
const prevRow = visibleData[_rowIndex - 1];
let nextRow = visibleData[_rowIndex + 1];
if(_rowIndex%2==0){
return {rowspan: 2, colspan: 1};
}else {
return {rowspan: 0, colspan: 0};
}
}
},
//明细修改弹窗 //明细修改弹窗
cellClickEvent_xb(row) { cellClickEvent_xb(row) {
this.mxList = row.row.mxList this.mxList = row.row.mxList
@ -2548,12 +2911,11 @@ export default {
return return
} }
getList(this.queryParam).then((res) => { getList(this.queryParam).then((res) => {
this.list = res.data.list this.list8 = res.data.list
this.gcrl=res.data.gcrl this.gcrl=res.data.gcrl
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid8.loadData(this.list8)
} }
}) })
this.activeName = 'first' this.activeName = 'first'
}, },
@ -2570,21 +2932,11 @@ export default {
if (!res.success){ if (!res.success){
this.$message.warning(res.message) this.$message.warning(res.message)
}else{ }else{
this.list = res.data this.list8 = res.data
// if (this.$refs.xGrid) { if (this.$refs.xGrid8) {
// this.$refs.xGrid.loadData(this.list) this.$refs.xGrid8.loadData(this.list8)
// } }
} }
// if (res.data.no_tlt) {
// this.selectMbch = res.data
// this.haveTltBoms = res.data.haveTltBoms
// this.dialogVisible = true;
// } else {
// this.list = res.data
// if (this.$refs.xGrid) {
// this.$refs.xGrid.loadData(this.list)
// }
// }
}) })
this.activeName = 'first' this.activeName = 'first'
}, },

19
src/views/sjzx/sbcnWH.vue
Unescape View File

@ -64,8 +64,9 @@
highlight-hover-row highlight-hover-row
@checkbox-all="selectAllEvent" @checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent" @checkbox-change="selectChangeEvent"
@cell-dblclick="cellClickEvent_xb"
> >
<!-- @cell-dblclick="cellClickEvent_xb"-->
</vxe-grid> </vxe-grid>
</div> </div>
</el-main> </el-main>
@ -173,14 +174,14 @@ 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: "sbbh", // field: "sbbh",
title: "设备编号", // title: "设备编号",
width: 120, // width: 120,
// editRender: { name: "$input",props: { clearable: true },}, // // editRender: { name: "$input",props: { clearable: true },},
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: 120,formatter:['dictFormat','CNKW'], { field: 'kw', title: '加工跨', width: 120,formatter:['dictFormat','CNKW'],
editRender: { editRender: {
name: "$select", name: "$select",

1
src/views/sjzx/sbxxWH.vue
Unescape View File

@ -111,6 +111,7 @@ export default {
sbbh: '', sbbh: '',
szcs: "", szcs: "",
gysbm: "", gysbm: "",
scbs: "1",
}, },
supplierList: [], //供应商 supplierList: [], //供应商
list: [], list: [],

129
src/views/sjzx/sbxxWH1.vue
Unescape View File

@ -18,6 +18,7 @@
<!-- >添加</el-button--> <!-- >添加</el-button-->
<!-- >--> <!-- >-->
<el-button type="primary" @click="initList()">查询</el-button> <el-button type="primary" @click="initList()">查询</el-button>
<el-button type="primary" @click="initList(2)">查询全部</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -104,13 +105,14 @@ import {
} from "@/api/sjzx/sbxxWH"; } from "@/api/sjzx/sbxxWH";
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
export default { export default {
name: "sbxxWH", name: "sbxxWH1",
data() { data() {
return { return {
request: { request: {
sbbh: '', sbbh: '',
szcs: "", szcs: "",
gysbm: "", gysbm: "",
scbs: "1",
}, },
supplierList: [], //供应商 supplierList: [], //供应商
list: [], list: [],
@ -209,7 +211,53 @@ export default {
], ],
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{
field: "azwz",
title: "安装位置",
align: "center",
minWidth: "110",
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{
field: "sbzt",
title: "固定资产状态",
align: "center",
minWidth: "120",
formatter:['dictFormat','SBZT'],
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{ field: 'scbs', title: '生产标识', width: 130,editRender: { name: "$input"},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gx', title: '工序', width: 100,formatter:['dictFormat','PCGX'], { field: 'gx', title: '工序', width: 100,formatter:['dictFormat','PCGX'],
editRender: { editRender: {
name: "$select", name: "$select",
@ -219,6 +267,16 @@ 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: 'kw', title: '跨位', width: 100,formatter:['dictFormat','CNKW'],
editRender: {
name: "$select",
options: [],
props: { clearable: true },
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'degs', title: '定额工时(小时)', width: 130,editRender: { name: "$input"}, { field: 'degs', title: '定额工时(小时)', width: 130,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', },
@ -373,6 +431,7 @@ export default {
this.emSbjbbZM("bmbm"); this.emSbjbbZM("bmbm");
this.initList(); this.initList();
this.initdwList(); this.initdwList();
this.initkwList();
this.initgzList(); this.initgzList();
}, },
computed: { computed: {
@ -383,7 +442,14 @@ export default {
methods: { methods: {
// 获取列表接口 // 获取列表接口
initList() { initList(p) {
if (p==2){
this.request.scbs=""
}else {
this.request.scbs="1"
}
getList(this.request).then((res) => { getList(this.request).then((res) => {
this.list = res.data; this.list = res.data;
@ -396,6 +462,24 @@ export default {
} }
}); });
}, },
initkwList(){
const dict=window.localStorage.getItem( 'CNKW');
const kwList =JSON.parse(dict)
this.$nextTick(() => {
const tableRef = this.$refs.tableRef;
const kw = tableRef.getColumnByField("kw");
const testList = [];
for (let i = 0; i < kwList.length; i++) {
const temp = {
label: kwList[i].bmsm,
value: kwList[i].bm,
};
testList.push(temp);
}
kw.editRender.options = testList;
});
},
initdwList(){ initdwList(){
const dict=window.localStorage.getItem( 'JLDW'); const dict=window.localStorage.getItem( 'JLDW');
const dwList =JSON.parse(dict) const dwList =JSON.parse(dict)
@ -521,51 +605,16 @@ export default {
} }
} }
}, },
// 设备信息转码接口 // 设备信息转码接口
emSbjbbZM(params) { emSbjbbZM(params) {
emSbjbbZM({ emSbjbbZM({
bmlb: params, bmlb: params,
}).then((res) => { }).then((res) => {
const tableRef = this.$refs.tableRef; const tableRef = this.$refs.tableRef;
if (params == "jldw") { if (params == "bmbm") {
// // 计量单位
// const list = res.data;
// const sbztText = tableRef.getColumnByField("jldw");
// const testList = [];
// for (let i = 0; i < list.length; i++) {
// const temp = {
// label: list[i].bmsm,
// value: list[i].bm,
// };
// testList.push(temp);
// }
// sbztText.editRender.options = testList;
// } else if (params == "sbzt") {
// 设备状态
// const list = res.data;
// const sbztText = tableRef.getColumnByField("sbzt");
// const testList = [];
// for (let i = 0; i < list.length; i++) {
// const temp = {
// label: list[i].bmsm,
// value: list[i].bm,
// };
// testList.push(temp);
// }
// sbztText.editRender.options = testList;
} else if (params == "bmbm") {
// // 所属部门 // // 所属部门
this.departmentOptions = res.data; this.departmentOptions = res.data;
// const sbztText = tableRef.getColumnByField("szcs");
// const testList = [];
// for (let i = 0; i < this.departmentOptions.length; i++) {
// const temp = {
// label: this.departmentOptions[i].bmsm,
// value: this.departmentOptions[i].bm,
// };
// testList.push(temp);
// }
// sbztText.editRender.options = testList;
}else if (params == "sbyxzt") { }else if (params == "sbyxzt") {
const sbyxztText = tableRef.getColumnByField("sbyxzt"); const sbyxztText = tableRef.getColumnByField("sbyxzt");
const testList = []; const testList = [];

Write Preview
Loading…
Cancel
Save