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

xn

Browse Source
master
xiaoning 2 years ago
parent 05e355ca80
commit de41312223
13 changed files with 597 additions and 450 deletions
Show Stats Download Patch File Download Diff File

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

@ -7,7 +7,7 @@ export function sh(data) {return request({url: '/dmSygd/sh', method: 'post', dat
export function saveByDcch(data) {return request({url: '/dmSygdMx/saveByDcch', method: 'post', data})} export function saveByDcch(data) {return request({url: '/dmSygdMx/saveByDcch', method: 'post', data})}
export function symxhz(data) {return request({url: '/dmSygdMx/symxhz', method: 'post', data})} export function symxhz(data) {return request({url: '/dmSygdMx/symxhz', method: 'post', data})}
export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})} export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})}
export function tqSygd() {return request({url: '/dmSygdMx/tqSygd', method: 'post'})} export function tqSygd(data) {return request({url: '/dmSygdMx/tqSygd', method: 'post',data})}
export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})} export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}
export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})} export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})}
export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})} export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})}

70
src/api/sy/depart.js
Unescape View File

@ -1,70 +0,0 @@
import request from '@/utils/request'
/**
* 获取全部部门
* @returns
*/
export function getAllDepart() {
return request({
url: '/api/sy/depart/getall',
method: 'get'
})
}
/**
* 条件查询部门及其子部门
* @param {*} data
* @returns
*/
export function getDepartByCon(data) {
return request({
url: '/api/sy/depart/getcon',
method: 'post',
data
})
}
/**
* 模糊查询和固定查询混查
* @param {*} data
* @returns
*/
export function getDepartByConDefaultDepartCode(data) {
return request({
url: '/api/sy/depart/getcondefault',
method: 'post',
data
})
}
/**
* 获取全部主部门
* @returns
*/
export function getAllParent(){
return request({
url: '/api/sy/depart/getallparent',
method: 'post'
})
}
/**
* 获取全部子部门
* @returns
*/
export function getAllChildren(){
return request({
url: '/api/sy/depart/getallchildren',
method: 'post'
})
}
export function getJjxmMap(){
return request({
url: '/api/zlgl/qcInspectionItem/mapList',
method: 'post'
})
}

1
src/api/sy/yhgl.js
Unescape View File

@ -40,6 +40,7 @@ export function getDepartList(data) {
}) })
} }
export function addRole(data) { export function addRole(data) {
return request({ return request({
url: '/api/sy/addRole', url: '/api/sy/addRole',

96
src/views/jhzx/gdxqDR.vue
Unescape View File

@ -1,9 +1,42 @@
<template> <template>
<el-container> <el-container>
<el-header style="width: 100%; height: 35px;font-size: 12px"> <el-header style="width: 100%; height: 60px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left"> <el-form :inline="true" label-width="65px" label-position="left">
<el-row > <el-row >
<el-col :span="15" > <el-col :span="4">
<el-form-item label="船号:">
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="queryParam.dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="400px"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item>
</el-col>
<el-col :span="11" >
<el-form-item > <el-form-item >
<span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">小组需求时间范围:</span> <span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">小组需求时间范围:</span>
<el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="month" style="width: 33%;" /> <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="month" style="width: 33%;" />
@ -30,6 +63,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col >
<el-form-item style="float: right" >
<span style="font-size: 12px;color: red; float: right;"> * 表中数据：红色为需求期提前；蓝色为拖期；</span>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-header> </el-header>
<el-container style="padding-top: 0px"> <el-container style="padding-top: 0px">
@ -65,7 +105,7 @@
</el-container> </el-container>
</template> </template>
<script> <script>
import router from "@/router";
import { getCzxx} from '@/api/jhzx/qfxq' import { getCzxx} from '@/api/jhzx/qfxq'
import {getList} from '@/api/jhzx/sygdxq' import {getList} from '@/api/jhzx/sygdxq'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -74,6 +114,7 @@ import { getToken } from '@/utils/auth'
import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue"; import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
import {endLoading, startLoading} from "@/utils"; import {endLoading, startLoading} from "@/utils";
import {Message} from "element-ui"; import {Message} from "element-ui";
import {getCzplBase} from "@/api/sjzx/jcsj";
export default { export default {
name:'GdxqDR', name:'GdxqDR',
components: {ScrollPane}, components: {ScrollPane},
@ -81,9 +122,20 @@ export default {
return { return {
activeName: 'first', activeName: 'first',
queryParam: { queryParam: {
dcCh:'',
beginTime:'', beginTime:'',
endTime:'' endTime:''
}, },
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
monthList:[], monthList:[],
list: [], list: [],
list1: [], list1: [],
@ -92,7 +144,6 @@ export default {
dictData:[], dictData:[],
height: '500px', height: '500px',
tableColumn:[ tableColumn:[
{ field: 'dcCh', title: '船只', minWidth: "70", { field: 'dcCh', title: '船只', minWidth: "70",
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', },
@ -179,12 +230,6 @@ export default {
}, },
], ],
// tableColumn2:[
// { field: 'dcCh', title: '船只', width: 200,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// }
// ],
isupload:'02', isupload:'02',
uploadData:{}, uploadData:{},
heads: { token: getToken() }, heads: { token: getToken() },
@ -216,7 +261,7 @@ export default {
} }
if (row.xqzt==='2') { if (row.xqzt==='2') {
return { return {
backgroundColor: 'darkseagreen', color: 'blue',
} }
} }
return null return null
@ -327,6 +372,10 @@ export default {
getCzxx({}).then(res=>{ getCzxx({}).then(res=>{
this.dictData = res.data this.dictData = res.data
}) })
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
var date = new Date(); var date = new Date();
var Y = date.getFullYear() + "/"; var Y = date.getFullYear() + "/";
var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/"; var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/";
@ -346,9 +395,9 @@ export default {
if (res.data){ if (res.data){
this.list = res.data this.list = res.data
// this.list2 = res.data.hz // this.list2 = res.data.hz
// if (this.$refs.xGrid) { if (this.$refs.xGrid) {
// this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)
// } }
// if (this.$refs.xGrid2) { // if (this.$refs.xGrid2) {
// this.$refs.xGrid2.loadData(this.list2) // this.$refs.xGrid2.loadData(this.list2)
// } // }
@ -380,7 +429,7 @@ export default {
return XEUtils.toDateString(cellValue, 'yyyy/MM/dd') return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
}, },
getHeight() { getHeight() {
this.height = window.innerHeight - 150 this.height = window.innerHeight - 170
}, },
format (val) { format (val) {
// this.monthList= [] ; // this.monthList= [] ;
@ -407,7 +456,22 @@ export default {
// return Y + M + D + h + m + s; // return Y + M + D + h + m + s;
this.queryParam.endTime=Y + M + D; this.queryParam.endTime=Y + M + D;
// return Y + M ; // return Y + M ;
} },
cellClickEvent({row}) {
this.queryParam.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
if (this.queryParam.dcCh) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
} }
} }
</script> </script>

20
src/views/jhzx/sygdCX.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<el-container> <el-container>
<el-header style="width: 100%; height: 50px;font-size: 12px"> <el-header style="width: 100%; height: 60px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left"> <el-form :inline="true" label-width="65px" label-position="left">
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
@ -32,7 +32,10 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10" :offset="14"> <el-col >
<el-form-item style="float: right" >
<span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -56,6 +59,7 @@
highlight-current-row highlight-current-row
highlight-hover-row highlight-hover-row
show-overflow show-overflow
:cell-style="cellStyle2"
@cell-click="cellClickEvent" @cell-click="cellClickEvent"
> >
</vxe-grid> </vxe-grid>
@ -99,6 +103,7 @@ export default {
}, },
], ],
list: [], list: [],
gcrl: [],
filedis:false, filedis:false,
uploadData:{}, uploadData:{},
dictData:[], dictData:[],
@ -358,13 +363,22 @@ export default {
return return
} }
getSygdList(this.queryParam).then((res) => { getSygdList(this.queryParam).then((res) => {
this.list = res.data this.list = res.data.list
this.gcrl=res.data.gcrl
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)
} }
}) })
}, },
cellStyle2({row}) {
if (this.gcrl.includes(row.gjjsXz)) {
return {
color: 'red',
cursor: 'pointer'
}
}
},
formatDate ({ cellValue }) { formatDate ({ cellValue }) {
return XEUtils.toDateString(cellValue, 'yyyy/MM/dd') return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
}, },

19
src/views/jhzx/sygdSH.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<el-container> <el-container>
<el-header style="width: 100%; height: 50px;font-size: 12px"> <el-header style="width: 100%; height: 60px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left"> <el-form :inline="true" label-width="65px" label-position="left">
<el-row> <el-row>
<el-col :span="15"> <el-col :span="15">
@ -36,9 +36,9 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10" :offset="14"> <el-col >
<el-form-item style="float: right" > <el-form-item style="float: right" >
<span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -63,6 +63,7 @@
highlight-current-row highlight-current-row
highlight-hover-row highlight-hover-row
show-overflow show-overflow
:cell-style="cellStyle2"
@checkbox-all="selectAllEvent" @checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent" @checkbox-change="selectChangeEvent"
> >
@ -107,6 +108,7 @@ export default {
}, },
], ],
list: [], list: [],
gcrl: [],
isupload:'02', isupload:'02',
filedis:false, filedis:false,
uploadData:{}, uploadData:{},
@ -428,7 +430,8 @@ export default {
return return
} }
getSygdList(this.queryParam).then((res) => { getSygdList(this.queryParam).then((res) => {
this.list = res.data this.list = res.data.list
this.gcrl=res.data.gcrl
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)
} }
@ -443,6 +446,14 @@ export default {
} }
}) })
}, },
cellStyle2({row}) {
if (this.gcrl.includes(row.gjjsXz)) {
return {
color: 'red',
cursor: 'pointer'
}
}
},
sh(){ sh(){
sh(this.checkedList).then((res)=>{ sh(this.checkedList).then((res)=>{
if (res){ if (res){

22
src/views/jhzx/sygdWH.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<el-container> <el-container>
<el-header style="width: 100%; height: 50px;font-size: 12px"> <el-header style="width: 100%; height: 60px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left"> <el-form :inline="true" label-width="65px" label-position="left">
<el-row> <el-row>
<el-col :span="15" > <el-col :span="15" >
@ -53,18 +53,21 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10" :offset="14"> <el-col >
<el-form-item style="float: right" > <el-form-item style="float: right" >
<span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-header> </el-header>
<el-container style="padding-top: 0px"> <el-container style="padding-top: 0px">
<el-container> <el-container>
<el-main> <el-main>
<div class="mytable"> <div class="mytable">
<vxe-grid <vxe-grid
id="id" id="id"
ref="xGrid" ref="xGrid"
@ -80,6 +83,7 @@
highlight-current-row highlight-current-row
highlight-hover-row highlight-hover-row
show-overflows show-overflows
:cell-style="cellStyle2"
@checkbox-all="selectAllEvent" @checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent" @checkbox-change="selectChangeEvent"
> >
@ -124,6 +128,7 @@ export default {
}, },
], ],
list: [], list: [],
gcrl: [],
isupload:'02', isupload:'02',
filedis:false, filedis:false,
uploadData:{}, uploadData:{},
@ -424,6 +429,14 @@ export default {
}) })
} }
}, },
cellStyle2({row}) {
if (this.gcrl.includes(row.gjjsXz)) {
return {
color: 'red',
cursor: 'pointer'
}
}
},
initBase(){ initBase(){
getCzxx({}).then(res=>{ getCzxx({}).then(res=>{
this.dictData = res.data this.dictData = res.data
@ -435,7 +448,8 @@ export default {
return return
} }
getSygdList(this.queryParam).then((res) => { getSygdList(this.queryParam).then((res) => {
this.list = res.data this.list = res.data.list
this.gcrl=res.data.gcrl
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)
} }

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

@ -29,6 +29,7 @@
<div class="mytable"> <div class="mytable">
<el-button type="success" @click="sygdPC()"> 提取明细</el-button> <el-button type="success" @click="sygdPC()"> 提取明细</el-button>
<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>
<vxe-grid <vxe-grid
id="id" id="id"
ref="xGrid" ref="xGrid"
@ -48,10 +49,10 @@
}" }"
@checkbox-all="selectAllEvent" @checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent" @checkbox-change="selectChangeEvent"
:cell-style="cellStyle2"
highlight-current-row highlight-current-row
highlight-hover-row highlight-hover-row
show-overflow show-overflow
> >
</vxe-grid> </vxe-grid>
</div> </div>
@ -255,6 +256,7 @@ export default {
components: {ScrollPane}, components: {ScrollPane},
data() { data() {
return { return {
gcrl:[],
dialogVisible: false, dialogVisible: false,
dialogVisible1: false, dialogVisible1: false,
title: '选择目标船只', title: '选择目标船只',
@ -1555,7 +1557,7 @@ export default {
tableColumn6: [ tableColumn6: [
{type: 'seq', width: 60, title: '序号', fixed: "left"}, {type: 'seq', width: 60, title: '序号', fixed: "left"},
{ {
field: 'dcCh', title: '船号', width: 100, field: 'dcCh', title: '船号', minWidth: "70",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1571,7 +1573,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'dcPl', title: '批量', width: 80, field: 'dcCh1', title: '目标船号', minWidth: "90",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1585,9 +1587,9 @@ export default {
} }
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },//数据来源船，真实数据时，为空
{ {
field: 'zl', title: '组立', width: 80, formatter: ['dictFormat', 'ZLLB'], field: 'dcPl', title: '批量', minWidth: "70",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1603,7 +1605,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'tzbh', title: '套料图号', width: 90, field: 'dcFd', title: '分段号', minWidth: "150",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1619,7 +1621,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'wpgg', title: '规格', width: 80, field: 'zl', title: '组立', minWidth: "70", formatter: ['dictFormat', 'ZLLB'],
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1635,7 +1637,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'jssj', title: '组立结束时间', width: 110, field: 'jssj', title: '钢料滚动需求期(小组)', minWidth: "160",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1651,7 +1653,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'jzbs', title: '矫正标识', width: 100, field: 'lqlb', title: '领取类型', width: 90, formatter: ['dictFormat', 'CLlQ'],
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1667,26 +1669,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'jzsb', field: 'lx', title: '物资类型', width: 90, formatter: this.formatterLx,
title: '矫正设备',
width: 100,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination'},
editRender: {name: "$select", options: [], props: {clearable: true}}
},
{
field: 'slrq', title: '上料计划日期', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1702,9 +1685,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'pwsb', field: 'kw', title: '跨位', width: 80, formatter: ['dictFormat', 'QGKW'],
title: '抛丸设备',
width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1717,11 +1698,10 @@ export default {
fVal2: '' fVal2: ''
} }
}], }],
filterRender: {name: 'FilterCombination'}, filterRender: {name: 'FilterCombination',}
editRender: {name: "$select", options: [], props: {clearable: true}}
}, },
{ {
field: 'pwrq', title: '抛丸计划日期', width: 100, field: 'tzbh', title: '套料图号', width: 90,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1737,7 +1717,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'hxcd', title: '划线长度(米)', width: 100, field: 'wpgg', title: '规格', width: 80,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1753,7 +1733,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'hxcdKc', title: '划线空程长度(米)', width: 100, field: 'bcshzl', title: '重量', width: 80,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1769,9 +1749,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'hxsb', field: 'wpxh', title: '材质', width: 80,
title: '划线设备',
width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1784,11 +1762,9 @@ export default {
fVal2: '' fVal2: ''
} }
}], }],
filterRender: {name: 'FilterCombination',},
editRender: {name: "$select", options: [], props: {clearable: true}}
}, },
{ {
field: 'hxrq', title: '划线计划日期', width: 100, field: 'xcms', title: '型材米数', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1804,7 +1780,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'qgcd', title: '切割长度（米)', width: 100, field: 'jzbs', title: '矫正标识', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1820,7 +1796,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'qgcdKc', title: '切割空程长度（米)', width: 100, field: 'hxcd', title: '划线长度(米)', minWidth: "110",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1836,26 +1812,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'qgsb', field: 'hxcdKc', title: '划线空程长度(米)', minWidth: "140",
title: '切割设备',
width: 100,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',},
editRender: {name: "$select", options: [], props: {clearable: true}}
},
{
field: 'qgrq', title: '切割计划日期', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1871,7 +1828,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'pklx', title: '坡口类型', width: 100, field: 'qgcd', title: '切割长度（米)', minWidth: "120",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1887,7 +1844,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'pkcd', title: '坡口长度', width: 100, field: 'qgcdKc', title: '切割空程长度（米)', minWidth: "140",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1903,26 +1860,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'pksb', field: 'slrq', title: '上料计划日期', minWidth: "120",
title: '坡口设备',
width: 100,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',},
editRender: {name: "$select", options: [], props: {clearable: true}}
},
{
field: 'pkrq', title: '坡口计划日期', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1938,7 +1876,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'qbs', title: '曲标识', width: 100, field: 'pwrq', title: '抛丸计划日期', minWidth: "120",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1954,26 +1892,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'qjgsb', field: 'hxrq', title: '划线计划日期', minWidth: "120",
title: '曲加工设备',
width: 100,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',},
editRender: {name: "$select", options: [], props: {clearable: true}}
},
{
field: 'qjgrq', title: '曲加工计划日期', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -1989,7 +1908,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'dmcd', title: '打磨长度', width: 100, field: 'qgrq', title: '切割计划日期', minWidth: "120",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2005,9 +1924,9 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
// { // {
// field: 'dmsb', // field: 'jzsb',
// title: '打磨设备', // title: '矫正设备',
// width: 100, // minWidth: "110",
// filters: [{ // filters: [{
// data: { // data: {
// checks: [], // checks: [],
@ -2020,44 +1939,91 @@ export default {
// fVal2: '' // fVal2: ''
// } // }
// }], // }],
// filterRender: {name: 'FilterCombination',}, // filterRender: {name: 'FilterCombination'},
// editRender: {name: "$select", options: [], props: {clearable: true}} // editRender: {name: "$select", options: [], props: {clearable: true}}
// }, // },
{ // {
field: 'dmrq', title: '打磨计划日期', width: 100, // field: 'pwsb',
filters: [{ // title: '抛丸设备',
data: { // minWidth: "110",
checks: [], // filters: [{
sVal: '', // data: {
sMenu: '', // checks: [],
fType1: '', // sVal: '',
fVal1: '', // sMenu: '',
fMode: 'and', // fType1: '',
fType2: '', // fVal1: '',
fVal2: '' // fMode: 'and',
} // fType2: '',
}], // fVal2: ''
filterRender: {name: 'FilterCombination',} // }
}, // }],
// filterRender: {name: 'FilterCombination'},
// editRender: {name: "$select", options: [], props: {clearable: true}}
// },
// {
// field: 'hxsb',
// title: '划线设备',
// minWidth: "110",
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',},
// editRender: {name: "$select", options: [], props: {clearable: true,}}
// },
// { field: 'hxry', title: '划线人员',width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
// {
// field: 'qgsb',
// title: '切割设备',
// minWidth: "110",
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',},
// editRender: {name: "$select", options: [], props: {clearable: true,}}
// },
// { field: 'qgry', title: '切割人员',width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
// {
// field: 'pklx', title: '坡口类型', minWidth: "110",
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',}
// },
{ {
field: 'gjjsDz', title: '钢加大组结束', width: 100, field: 'pkcd', title: '坡口长度', minWidth: "110",
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},
{
field: 'gjjsXz', title: '钢加小组结束', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2072,8 +2038,28 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
// {
// field: 'pksb',
// title: '坡口设备',
// minWidth: "110",
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }
// ],
// filterRender: {name: 'FilterCombination',},
// editRender: {name: "$select", options: [], props: {clearable: true,}}
// },
{ {
field: 'ljsl', title: '零件数量', width: 100, field: 'pkrq', title: '坡口计划日期', minWidth: "130",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2089,7 +2075,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'gjks', title: '钢加开始', width: 100, field: 'dmcd', title: '打磨长度', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2105,7 +2091,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'dcFd', title: '分段号', width: 100, field: 'dmrq', title: '打磨计划日期', minWidth: "130",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2121,39 +2107,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'dcCh2', title: '本船号', width: 100, field: 'qbs', title: '曲标识', width: 100,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},//没有真实数据时，为空
{
field: 'dcCh1', title: '目标船号', width: 90,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
filterRender: {name: 'FilterCombination',}
},//数据来源船，真实数据时，为空
{
field: 'lqlb', title: '领取类型', width: 90, formatter: ['dictFormat', 'CLlQ'],
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2168,8 +2122,30 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
// {
// field: 'qjgsb',
// title: '曲加工设备',
// minWidth: "120",
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',},
// editRender: {name: "$select", options: [], props: {clearable: true,}}
// },
// { field: 'qjgry', title: '曲加工人员',width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
{ {
field: 'lx', title: '物资类型', width: 90, formatter: this.formatterLx, field: 'qjgrq', title: '曲加工计划日期', minWidth: "140",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2184,8 +2160,29 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
// {
// field: 'dmsb',
// title: '打磨设备',
// minWidth: "110",
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',},
// editRender: {name: "$select", options: [], props: {clearable: true,}}
// },
{ {
field: 'kw', title: '跨位', width: 80, formatter: ['dictFormat', 'QGKW'], field: 'gjjsDz', title: '钢料滚动需求期(大组)', minWidth: "160",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2200,8 +2197,24 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
// {
// field: 'gjjsXz', title: '钢加小组结束', width: 100,
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',}
// },
{ {
field: 'zt', title: '状态', width: 70, formatter: ['dictFormat', 'SYZT'], field: 'ljsl', title: '零件数量', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2216,8 +2229,24 @@ export default {
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
// {
// field: 'gjks', title: '钢加开始', width: 100,
// filters: [{
// data: {
// checks: [],
// sVal: '',
// sMenu: '',
// fType1: '',
// fVal1: '',
// fMode: 'and',
// fType2: '',
// fVal2: ''
// }
// }],
// filterRender: {name: 'FilterCombination',}
// },
{ {
field: 'bcshzl', title: '重量', width: 80, field: 'dcCh2', title: '本船号', width: 100,
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2231,24 +2260,9 @@ export default {
} }
}], }],
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },//没有真实数据时，为空
{
field: 'wpxh', title: '材质', width: 80,
filters: [{
data: {
checks: [],
sVal: '',
sMenu: '',
fType1: '',
fVal1: '',
fMode: 'and',
fType2: '',
fVal2: ''
}
}],
},
{ {
field: 'xcms', title: '型材米数', width: 100, field: 'zt', title: '状态', width: 70, formatter: ['dictFormat', 'SYZT'],
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2264,7 +2278,7 @@ export default {
filterRender: {name: 'FilterCombination',} filterRender: {name: 'FilterCombination',}
}, },
{ {
field: 'gxsj', title: '数据更新时间', width: 100, field: 'gxsj', title: '数据更新时间', minWidth: "130",
filters: [{ filters: [{
data: { data: {
checks: [], checks: [],
@ -2330,11 +2344,6 @@ 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: '', title: '跨位需求重量', width: 150,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
], ],
} }
}, },
@ -2418,6 +2427,14 @@ export default {
} }
} }
}, },
cellStyle2({row}) {
if (this.gcrl.includes(row.jssj)) {
return {
color: 'red',
cursor: 'pointer'
}
}
},
//明细修改弹窗，区分是否本船只 //明细修改弹窗，区分是否本船只
cellStyle1({row}) { cellStyle1({row}) {
if (row.dcCh1) { if (row.dcCh1) {
@ -2426,7 +2443,6 @@ export default {
cursor: 'pointer' cursor: 'pointer'
} }
} }
}, },
//明细修改弹窗，可修改列 //明细修改弹窗，可修改列
headerCellStyle({column}) { headerCellStyle({column}) {
@ -2440,7 +2456,7 @@ export default {
}, },
//提取三月滚动 //提取三月滚动
tqSygd() { tqSygd() {
tqSygd().then((res) => { tqSygd(this.list).then((res) => {
if (res.data) { if (res.data) {
router.push({ router.push({
name: 'SygdWH', name: 'SygdWH',
@ -2526,7 +2542,8 @@ export default {
return return
} }
getList(this.queryParam).then((res) => { getList(this.queryParam).then((res) => {
this.list = res.data this.list = res.data.list
this.gcrl=res.data.gcrl
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)
} }

35
src/views/jhzx/ydjhzxXF.vue
Unescape View File

@ -21,6 +21,34 @@
</el-header> </el-header>
<el-container style="padding-top: 0px"> <el-container style="padding-top: 0px">
<el-main> <el-main>
<div class="mytable">
<!-- <el-button type="success" @click="symxhz">汇总</el-button>-->
<vxe-grid
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
>
</vxe-grid>
</div>
<!--
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="月度计划" name="first"> <el-tab-pane label="月度计划" name="first">
<div class="mytable"> <div class="mytable">
@ -51,6 +79,7 @@
</vxe-grid> </vxe-grid>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="图纸信息" name="second"> <el-tab-pane label="图纸信息" name="second">
<div class="mytable"> <div class="mytable">
<vxe-grid <vxe-grid
@ -165,8 +194,10 @@
</vxe-grid> </vxe-grid>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs>
</el-tabs> -->
</el-main> </el-main>
</el-container> </el-container>
</el-container> </el-container>
@ -1031,7 +1062,7 @@ export default {
return XEUtils.toDateString(cellValue, 'yyyy/MM/dd') return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
}, },
getHeight() { getHeight() {
this.height = window.innerHeight - 230 this.height = window.innerHeight - 150
}, },
} }

17
src/views/xtgl/bmgl.vue
Unescape View File

@ -102,9 +102,8 @@
{ type: 'seq', width: 60, title: '序号' }, { type: 'seq', width: 60, title: '序号' },
{ field: 'itemValue', title: '名称', editRender: { name: 'input' }}, { field: 'itemValue', title: '名称', editRender: { name: 'input' }},
{ field: 'itemCode', title: '数据值', editRender: { name: 'input' }}, { field: 'itemCode', title: '数据值', editRender: { name: 'input' }},
{ field: 'remark', title: '备注', editRender: { name: 'input' }}, // { field: 'remark', title: '备注', editRender: { name: 'input' }},
{ field: 'dictCode', title: '字典编码' }, { field: 'dictCode', title: '字典编码' }
{ field: 'id', visible: false }
] ]
} }
}, },
@ -177,13 +176,13 @@
}) })
} }
if (removeRecords.length !== 0) { if (removeRecords.length !== 0) {
const delArr = [] // const delArr = []
removeRecords.forEach(function (value, index) { // removeRecords.forEach(function (value, index) {
delArr[index] = value.id // delArr[index] = value.id
}) // })
console.log(delArr) console.log(removeRecords)
await del(delArr).then(response => { await del(removeRecords).then(response => {
this.tableData = response.data this.tableData = response.data
this.loadData() this.loadData()
}) })

73
src/views/xtgl/gngl.vue
Unescape View File

@ -2,20 +2,20 @@
<el-container style="height: 100%;position: absolute;width: 100%;"> <el-container style="height: 100%;position: absolute;width: 100%;">
<el-col :span="16" style="height:100%;"> <el-col :span="16" style="height:100%;">
<div> <div>
<el-select <!-- <el-select-->
v-model="query.system_code" <!-- v-model="query.system_code"-->
v-loading="isZxtbmLoading" <!-- v-loading="isZxtbmLoading"-->
clearable <!-- clearable-->
placeholder="子系统" <!-- placeholder="子系统"-->
style="width: 110px" <!-- style="width: 110px"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in zxtbmList" <!-- v-for="item in zxtbmList"-->
:key="item.system_code" <!-- :key="item.zxtdm"-->
:label="item.system_name" <!-- :label="item.zxtms"-->
:value="item.system_code" <!-- :value="item.zxtdm"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
<el-input v-model="query.word" placeholder="全文检索" style="width: 200px" clearable /> <el-input v-model="query.word" placeholder="全文检索" style="width: 200px" clearable />
<el-button style="margin: 1px" type="primary" icon="el-icon-search" @click="handleQuerySubmit">查询</el-button> <el-button style="margin: 1px" type="primary" icon="el-icon-search" @click="handleQuerySubmit">查询</el-button>
<div style="float: right;display: none;"> <div style="float: right;display: none;">
@ -41,22 +41,23 @@
@current-change="handleTableCurrentChange" @current-change="handleTableCurrentChange"
@header-click="showFilter" @header-click="showFilter"
> >
<el-table-column sortable label="标识" property="id" /> <el-table-column sortable label="子系统" property="zxtbm" width="150px">
<el-table-column sortable label="父级标识" property="parent_id" width="110px" />
<el-table-column sortable label="子系统" property="system_code" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ getSystemName(scope.row.system_code) }} {{ getSystemName(scope.row.zxtbm) }}
</template>
</el-table-column>
<el-table-column sortable label="菜单名称" property="menu_name" width="130px" />
<el-table-column sortable label="组件路径" property="component_path" width="200px" />
<el-table-column sortable label="重定向" property="redirect" width="120px" />
<el-table-column sortable label="图标" property="icon" />
<el-table-column sortable label="菜单状态" property="menu_status" width="100px">
<template slot-scope="scope">
{{ scope.row.menu_status == 1?'使用':'无效' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column sortable label="所属模块" property="ylzd1" width="150px" />
<el-table-column sortable label="菜单名称" property="ms" width="150px" />
<el-table-column sortable label="组件路径" property="ckcs" width="200px" />
<!-- <el-table-column sortable label="重定向" property="redirect" width="120px" />-->
<!-- <el-table-column sortable label="图标" property="icon" />-->
<!-- <el-table-column sortable label="菜单状态" property="menu_status" width="100px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.menu_status == 1?'使用':'无效' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column sortable label="排序1" property="ylzd2" width="100px" />
<el-table-column sortable label="排序2" property="ylzd3" width="100px" />
</el-table> </el-table>
<el-pagination <el-pagination
@ -156,9 +157,9 @@
> >
<el-table-column label="序号" type="index" /> <el-table-column label="序号" type="index" />
<el-table-column sortable label="部门" width="100px"> <el-table-column sortable label="部门" width="100px">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
{{ getDepartName(scope.row.depart_code) }} <!-- {{ getDepartName(scope.row.depart_code) }}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="用户账号" property="user_code" /> <el-table-column label="用户账号" property="user_code" />
<el-table-column label="用户名称" property="user_name" /> <el-table-column label="用户名称" property="user_name" />
@ -243,14 +244,14 @@ export default {
getSystemList({}).then(response => { getSystemList({}).then(response => {
this.zxtbmList = response.data this.zxtbmList = response.data
this.isZxtbmLoading = false this.isZxtbmLoading = false
getDepartList({}).then(response => { // getDepartList({}).then(response => {
this.dm_depart = response.data // this.dm_depart = response.data
getMenuList({}).then(response => { getMenuList({}).then(response => {
this.funcTableData = response.data this.funcTableData = response.data
this.isFuncTableLoading = false this.isFuncTableLoading = false
this.$refs.funcTable.setCurrentRow(this.funcTableData[0]) this.$refs.funcTable.setCurrentRow(this.funcTableData[0])
}) })
}) // })
}) })
}, },
methods: { methods: {
@ -333,10 +334,10 @@ export default {
} }
return '' return ''
}, },
getSystemName(system_code) { getSystemName(zxtbm) {
for (const i in this.zxtbmList) { for (const i in this.zxtbmList) {
if (this.zxtbmList[i].system_code === system_code) { if (this.zxtbmList[i].zxtdm === zxtbm) {
return this.zxtbmList[i].system_name return this.zxtbmList[i].zxtms
} }
} }
return '' return ''

152
src/views/xtgl/jsgl.vue
Unescape View File

@ -81,20 +81,17 @@
element-loading-background="rgba(0, 0, 0, 0.01)" element-loading-background="rgba(0, 0, 0, 0.01)"
element-loading-text="数据正在加载中" element-loading-text="数据正在加载中"
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
@row-click="handleGzzTablRowClick"
@header-click="handleGzzTableHeadClick"
@current-change="handleGzzCurrentChange"
> >
<el-table-column label="" property="checked" style="width: 30px;"> <el-table-column label="" property="checked" style="width: 30px;">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="scope.row.checked" @change="handleYhxxSelect(scope.row)" /> <el-checkbox v-model="scope.row.checked" @change="handleYhxxSelect(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户代码" property="user_code" /> <el-table-column label="用户代码" property="yhdm" />
<el-table-column label="用户名称" property="user_name" /> <el-table-column label="用户名称" property="yhms" />
<el-table-column label="所属部门" property="depart_code"> <el-table-column label="所属部门" property="bmbm">
<template slot-scope="scope"> <template slot-scope="scope">
{{ getDepartName(scope.row.depart_code) }} {{ getDepartName(scope.row.bmbm) }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -113,9 +110,6 @@
element-loading-background="rgba(0, 0, 0, 0.01)" element-loading-background="rgba(0, 0, 0, 0.01)"
element-loading-text="数据正在加载中" element-loading-text="数据正在加载中"
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
@row-click="handleGzzTablRowClick"
@header-click="handleGzzTableHeadClick"
@current-change="handleGzzCurrentChange"
> >
<el-table-column label="" property="checked" style="width: 30px;"> <el-table-column label="" property="checked" style="width: 30px;">
<template slot-scope="scope"> <template slot-scope="scope">
@ -140,17 +134,14 @@
element-loading-background="rgba(0, 0, 0, 0.01)" element-loading-background="rgba(0, 0, 0, 0.01)"
element-loading-text="数据正在加载中" element-loading-text="数据正在加载中"
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
@row-click="handleGzzTablRowClick"
@header-click="handleGzzTableHeadClick"
@current-change="handleGzzCurrentChange"
> >
<el-table-column label="" property="checked" style="width: 30px;"> <el-table-column label="" property="checked" style="width: 30px;">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="scope.row.checked" @change="handleZxtSelect(scope.row)" /> <el-checkbox v-model="scope.row.checked" @change="handleZxtSelect(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编码" property="system_code" /> <el-table-column label="编码" property="zxtdm" />
<el-table-column label="子系统名称" property="system_name" /> <el-table-column label="子系统名称" property="zxtms" />
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
@ -172,31 +163,28 @@
</el-col> </el-col>
<el-col :span="18" :height="defaultHeight.height"> <el-col :span="18" :height="defaultHeight.height">
<div :height="defaultHeight.height"> <div :height="defaultHeight.height">
<el-table <!-- <el-table-->
ref="gnqxTable" <!-- ref="gnqxTable"-->
v-loading="isGnqxTableLoading" <!-- v-loading="isGnqxTableLoading"-->
:show-overflow-tooltip="true" <!-- :show-overflow-tooltip="true"-->
:data="c_gnqxTableData.slice((currentPage-1)*pageSize,currentPage*pageSize)" <!-- :data="c_gnqxTableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"-->
:height="defaultHeight.height35" <!-- :height="defaultHeight.height35"-->
width="100%" <!-- width="100%"-->
:border="true" <!-- :border="true"-->
highlight-current-row <!-- highlight-current-row-->
element-loading-background="rgba(0, 0, 0, 0.01)" <!-- element-loading-background="rgba(0, 0, 0, 0.01)"-->
element-loading-text="数据正在加载中" <!-- element-loading-text="数据正在加载中"-->
element-loading-spinner="el-icon-loading" <!-- element-loading-spinner="el-icon-loading"-->
@row-click="handleGzzTablRowClick" <!-- >-->
@header-click="handleGzzTableHeadClick" <!-- <el-table-column label="" property="checked" style="width: 30px;">-->
@current-change="handleGzzCurrentChange" <!-- <template slot-scope="scope">-->
> <!-- <el-checkbox v-model="scope.row.checked" @change="handleGnqxSelect(scope.row)" />-->
<el-table-column label="" property="checked" style="width: 30px;"> <!-- </template>-->
<template slot-scope="scope"> <!-- </el-table-column>-->
<el-checkbox v-model="scope.row.checked" @change="handleGnqxSelect(scope.row)" /> <!-- <el-table-column label="菜单名称" property="ms" />-->
</template> <!-- <el-table-column label="功能类别" property="gnlb" />-->
</el-table-column> <!-- <el-table-column label="菜单" property="ckcs" />-->
<el-table-column label="菜单名称" property="menu_name" /> <!-- </el-table>-->
<el-table-column label="功能类别" property="gnlb" />
<el-table-column label="菜单" property="ylzd1" />
</el-table>
<el-pagination <el-pagination
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[20, 50, 100, 10000]" :page-sizes="[20, 50, 100, 10000]"
@ -371,12 +359,83 @@ export default {
}, },
getSystemName(system_code) { getSystemName(system_code) {
for (const i in this.zxtbmList) { for (const i in this.zxtbmList) {
if (this.zxtbmList[i].system_code === system_code) { if (this.zxtbmList[i].zxtdm === system_code) {
return this.zxtbmList[i].system_name return this.zxtbmList[i].zxtms
} }
} }
return '' return ''
}, },
// parseTreeData(menu) {
// const treeData = [{ 'label': '全部功能', 'id': '@', children: [], disabled: true }]
//
// const myMap = new Map();
// for (let i = 0; i< menu.length - 1; i++) {
// if (menu[i].ylzd1) {
// menu[i].children = []
// myMap.set(menu[i].ylzd1,menu[i])
// }
// }
// for (let i = 0; i< menu.length - 1; i++) {
// if (myMap.has(menu[i].ylzd1)) {
// myMap.get(menu[i].ylzd1).children.push(menu[i])
// }
// }
// // let id = 0;
// // myMap.forEach((value, key) => {
// // console.log('info1',key)
// // console.log('info2',value)
// // id = id+1;
// // treeData[0].children.push({ 'label': key, 'id': id, 'children': value.children })
// // });
// console.log("info",myMap.get(menu[1].ylzd1))
// // const treeData= [{ 'label': '全部功能', 'id': '@', children: [], disabled: true }]
// treeData[0].children.push({ 'label': '计划排产', 'id': 1, 'children': []})
// treeData[0].children.push({ 'label': '计划排产', 'id': 2, 'children': []})
// treeData[0].children.push({ 'label': '计划排产', 'id': 3, 'children': []})
// // console.log('info',myMap)
// // console.log('infotree',treeData)
// // const info = menu.reduce((map, node) => {
// // node.label = node.ylzd1
// // node.children = []
// // return map[node.ylzd1] = node, node.children = [], map
// // const myMap = new Map([
// // [node.ylzd1, node]
// // ]);
// // return map[node.ylzd1,node], map
// // }, {})
// // console.log('info',info)
// // for (let i = 0; i< menu.length - 1; i++) {
// // if (info[menu[i].ylzd1]) {
// // info[menu[i].ylzd1].children.push(menu[i])
// // }
// // }
// // for(let item of info){
// // console.log('info',item)
// // }
//
// // console.log('info',info)
//
// // const result = menu.filter(node => {
// // if (info[node.ylzd1]) {
// // info[node.ylzd1].children.push(node)
// // }
// // return !node.ylzd1
// // })
// // const system_menu = {}
// // for (let i = 0; i < result.length; i++) {
// //
// // if (!system_menu[result[i].system_code]) {
// // system_menu[result[i].system_code] = []
// // }
// // system_menu[result[i].system_code].push(result[i])
// // }
// // for (let i = 0; i < this.zxtbmList.length; i++) {
// //
// // const key = this.zxtbmList[i].zxtbm
// // treeData[0].children.push({ 'label': this.getSystemName(key), 'id': key, 'children': system_menu[key] })
// // }
// return treeData
// },
parseTreeData(menu) { parseTreeData(menu) {
const treeData = [{ 'label': '全部功能', 'id': '@', children: [], disabled: true }] const treeData = [{ 'label': '全部功能', 'id': '@', children: [], disabled: true }]
@ -398,10 +457,13 @@ export default {
} }
system_menu[result[i].system_code].push(result[i]) system_menu[result[i].system_code].push(result[i])
} }
console.log('info',info)
console.log('result',result)
for (let i = 0; i < this.zxtbmList.length; i++) { for (let i = 0; i < this.zxtbmList.length; i++) {
const key = this.zxtbmList[i].system_code const key = this.zxtbmList[i].zxtdm
treeData[0].children.push({ 'label': this.getSystemName(key), 'id': key, 'children': system_menu[key] }) treeData[0].children.push({ 'label': this.getSystemName(key), 'id': key, 'children': system_menu[key] })
} }
console.log('treeData',treeData)
return treeData return treeData
}, },
handleWorkGroupChange(val) { handleWorkGroupChange(val) {
@ -430,7 +492,7 @@ export default {
getUserListByRole(val).then(response => { getUserListByRole(val).then(response => {
for (const i in response.data) { for (const i in response.data) {
for (const j in this.yhxxTableData) { for (const j in this.yhxxTableData) {
if (response.data[i].user_code === this.yhxxTableData[j].user_code) { if (response.data[i].yhdm === this.yhxxTableData[j].yhdm) {
this.$set(this.yhxxTableData[j], 'checked', true) this.$set(this.yhxxTableData[j], 'checked', true)
} }
} }
@ -452,7 +514,7 @@ export default {
getSystemListByRole(val).then(response => { getSystemListByRole(val).then(response => {
for (const i in response.data) { for (const i in response.data) {
for (const j in this.zxtqxTableData) { for (const j in this.zxtqxTableData) {
if (response.data[i].system_code === this.zxtqxTableData[j].system_code) { if (response.data[i].zxtdm === this.zxtqxTableData[j].zxtdm) {
this.$set(this.zxtqxTableData[j], 'checked', true) this.$set(this.zxtqxTableData[j], 'checked', true)
} }
} }

99
src/views/xtgl/yhgl.vue
Unescape View File

@ -12,7 +12,7 @@
/> />
</el-select> </el-select>
姓名： 姓名：
<el-input v-model="query.uesr_name" placeholder="姓名" style="width: 110px" clearable /> <el-input v-model="query.yhms" placeholder="姓名" style="width: 110px" clearable />
<el-button style="margin: 1px" type="primary" icon="el-icon-search">查询</el-button> <el-button style="margin: 1px" type="primary" icon="el-icon-search">查询</el-button>
<div style="float: right;"> <div style="float: right;">
<el-button style="margin: 1px" type="success" @click="handleAddYhxx">增加</el-button> <el-button style="margin: 1px" type="success" @click="handleAddYhxx">增加</el-button>
@ -38,24 +38,23 @@
@current-change="handleYhxxCurrentChange" @current-change="handleYhxxCurrentChange"
@header-click="showFilter" @header-click="showFilter"
> >
<el-table-column sortable label="账号" property="user_code" /> <el-table-column sortable label="账号" property="yhdm" />
<el-table-column sortable label="姓名" property="user_name" /> <el-table-column sortable label="职号" property="ylzd2" />
<el-table-column sortable label="姓名" property="yhms" />
<el-table-column sortable label="部门" width="100px"> <el-table-column sortable label="部门" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ getDepartName(scope.row.depart_code) }} {{ getDepartName(scope.row.bmbm) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column sortable label="登陆类型">
<template slot-scope="scope"> <el-table-column sortable label="审批权限" >
{{ scope.row.login_type == 1?'指纹':'密码' }} <template slot-scope="scope">
</template> {{ getSpqx(scope.row.ylzd1) }}
</el-table-column> </template>
<el-table-column sortable label="用户状态">
<template slot-scope="scope">
{{ scope.row.user_status == 1?'启用':'禁用' }}
</template>
</el-table-column> </el-table-column>
<el-table-column sortable label="备注" property="remark" /> <!-- <el-table-column sortable label="代码(复制到)" property="yhdm1"/>-->
<!-- <el-table-column sortable label="备注" property="remark" />-->
</el-table> </el-table>
<el-pagination <el-pagination
:current-page="currentPage" :current-page="currentPage"
@ -71,15 +70,15 @@
<el-row> <el-row>
<el-row> <el-row>
<span style="width: 110px;display:inline-block;">账号：</span> <span style="width: 110px;display:inline-block;">账号：</span>
<el-input v-model="updateData.user_code" placeholder="" style="width: 250px;" /> <el-input v-model="updateData.yhdm" placeholder="" style="width: 250px;" :disabled="inputDisabled"/>
</el-row> </el-row>
<el-row> <el-row>
<span style="width: 110px;display:inline-block;">姓名：</span> <span style="width: 110px;display:inline-block;">姓名：</span>
<el-input v-model="updateData.user_name" placeholder="" style="width: 250px;" /> <el-input v-model="updateData.yhms" placeholder="" style="width: 250px;" />
</el-row> </el-row>
<el-row> <el-row>
<span style="width: 110px;display:inline-block;">部门：</span> <span style="width: 110px;display:inline-block;">部门：</span>
<el-select v-model="updateData.depart_code" clearable placeholder="部门" style="width: 250px;"> <el-select v-model="updateData.bmbm" clearable placeholder="部门" style="width: 250px;">
<el-option <el-option
v-for="item in dm_depart" v-for="item in dm_depart"
:key="item.depart_code" :key="item.depart_code"
@ -88,36 +87,24 @@
/> />
</el-select> </el-select>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <span style="width: 110px;display:inline-block;">密码：</span>-->
<!-- <el-input v-model="updateData.pwd" placeholder="" style="width: 250px;" />-->
<!-- </el-row>-->
<el-row> <el-row>
<span style="width: 110px;display:inline-block;">登录方式：</span> <span style="width: 110px;display:inline-block;">审批权限：</span>
<el-select v-model="updateData.login_type" clearable placeholder="登录方式" style="width: 250px;"> <el-select v-model="updateData.ylzd1" clearable placeholder="权限" style="width: 250px;">
<el-option <el-option
v-for="item in loginType" v-for="item in spqx"
:key="item.value" :key="item.bm"
:label="item.label" :label="item.bmsm"
:value="item.value" :value="item.bm"
/> />
</el-select> </el-select>
</el-row> </el-row>
<el-row> <el-row>
<span style="width: 110px;display:inline-block;">密码：</span> <span style="width: 110px;display:inline-block;">职号：</span>
<el-input v-model="updateData.password" placeholder="" style="width: 250px;" /> <el-input v-model="updateData.ylzd2" placeholder="" style="width: 250px;" />
</el-row>
<el-row>
<template v-if="dialogTitle=='修改用户信息'">
<span style="width: 110px;display:inline-block;">指纹:</span>
<!-- {{updateData.fingerprint}}-->
<!-- <template v-if="updateData.fingerprint==''||updateData.fingerprint==null">-->
<el-button @click="addFinger">修改指纹1</el-button>
<el-button @click="addFinger1">修改指纹2</el-button>
<el-button @click="addFinger2">修改指纹3</el-button>
<!-- </template>-->
</template>
</el-row>
<el-row>
<span style="width: 110px;display:inline-block;">备注：</span>
<el-input v-model="updateData.remark" placeholder="" style="width: 250px;" />
</el-row> </el-row>
<el-row> <el-row>
<el-button <el-button
@ -195,9 +182,11 @@ export default {
defaultHeight: { defaultHeight: {
height: '' height: ''
}, },
inputDisabled:true,
activeGzzxxTabName: 'gzzxx', activeGzzxxTabName: 'gzzxx',
dm_depart: [], dm_depart: [],
query: { depart_code: '' }, spqx: [],
query: { depart_code: ''},
yhxxTableData: [], yhxxTableData: [],
isYhxxTableLoading: true, isYhxxTableLoading: true,
@ -225,13 +214,13 @@ export default {
let resultList = this.yhxxTableData let resultList = this.yhxxTableData
if (search && search.depart_code) { if (search && search.depart_code) {
resultList = this.yhxxTableData.filter(data => { resultList = this.yhxxTableData.filter(data => {
return data.depart_code === search.depart_code return data.bmbm === search.depart_code
}) })
} }
if (search && search.user_name) { if (search && search.yhms) {
resultList = resultList.filter(data => { resultList = resultList.filter(data => {
return Object.keys(data).some(key => { return Object.keys(data).some(key => {
return String(data[key]).indexOf(search.user_name) > -1 return String(data[key]).indexOf(search.yhms) > -1
}) })
}) })
} }
@ -251,11 +240,12 @@ export default {
this.isYhxxTableLoading = false this.isYhxxTableLoading = false
this.$refs.yhxxTable.setCurrentRow(this.yhxxTableData[0]) this.$refs.yhxxTable.setCurrentRow(this.yhxxTableData[0])
}) })
getRoleList().then(response => { getRoleList().then(response => {
this.gzzTableData = response.data this.gzzTableData = response.data
this.isGzzTableLoading = false this.isGzzTableLoading = false
}) })
const dict= window.localStorage.getItem("SPQX");
this.spqx=JSON.parse(dict);
}) })
}, methods: { }, methods: {
showFilter(column) { showFilter(column) {
@ -275,7 +265,8 @@ export default {
this.currentPage = val this.currentPage = val
}, },
handleYhxxCurrentChange(currentRow) { handleYhxxCurrentChange(currentRow) {
if (!currentRow || !currentRow.user_code) return
if (!currentRow || !currentRow.yhdm) return
this.selectYhxx = currentRow this.selectYhxx = currentRow
this.isGzzTableLoading = true this.isGzzTableLoading = true
getRoleListByUser(this.selectYhxx).then(response => { getRoleListByUser(this.selectYhxx).then(response => {
@ -310,8 +301,10 @@ export default {
}, },
handleAddYhxx() { handleAddYhxx() {
this.dialogVisible = true this.dialogVisible = true
this.inputDisabled=false;
this.dialogTitle = '添加用户信息' this.dialogTitle = '添加用户信息'
this.updateData = {} this.updateData = {}
}, },
handleAddYhxxComplated() { handleAddYhxxComplated() {
if(this.updateData.login_type===1) { if(this.updateData.login_type===1) {
@ -360,13 +353,15 @@ export default {
}, },
handleUpdateYhxx() { handleUpdateYhxx() {
if (!this.selectYhxx.user_code) { if (!this.selectYhxx.yhdm) {
this.$message({ message: '请选择要修改的用户！', type: 'error' }) this.$message({ message: '请选择要修改的用户！', type: 'error' })
return return
} }
this.dialogVisible = true this.dialogVisible = true
this.dialogTitle = '修改用户信息' this.dialogTitle = '修改用户信息'
console.log(this.selectYhxx)
this.updateData = JSON.parse(JSON.stringify(this.selectYhxx)) this.updateData = JSON.parse(JSON.stringify(this.selectYhxx))
this.inputDisabled=true;
}, },
handleUpdateYhxxComplated() { handleUpdateYhxxComplated() {
updateUser(this.updateData).then(response => { updateUser(this.updateData).then(response => {
@ -397,6 +392,14 @@ export default {
} }
return '' return ''
}, },
getSpqx(depart_code) {
for (const i in this.spqx) {
if (this.spqx[i].bm === depart_code) {
return this.spqx[i].bmsm
}
}
return ''
},
exportExcel() { exportExcel() {
/* generate workbook object from table */ /* generate workbook object from table */
// 表名 // 表名

Write Preview
Loading…
Cancel
Save