xiaoning 1 year ago
parent e57e1832d4
commit 4a0e79d5c8

@ -63,3 +63,12 @@ export function delete1(data) {
data,
});
}
//设备加工人员
export function getSbjgrys(data) {
return request({
url: "/emSbjgry/getList",
method: "post",
data,
});
}

@ -6,6 +6,12 @@ export function login(data) {
method: 'post',
data
})
}export function updatePassword(data) {
return request({
url: '/api/updatePassword',
method: 'post',
data
})
}
export function getInfo(token) {

@ -29,9 +29,9 @@
<!-- <router-link to="/">-->
<!-- <el-dropdown-item>返回首页</el-dropdown-item>-->
<!-- </router-link>-->
<!-- <router-link to="/profile/index">-->
<!-- <el-dropdown-item>修改密码</el-dropdown-item>-->
<!-- </router-link>-->
<router-link to="/profile/index">
<el-dropdown-item>修改密码</el-dropdown-item>
</router-link>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出登陆</span>
</el-dropdown-item>
@ -71,8 +71,9 @@ export default {
this.$store.dispatch('app/toggleSideBar')
},
async logout() {
await this.$store.dispatch('yuser/logout')
this.$router.push(`/menu?redirect=/`)
// await this.$store.dispatch('user/logout')
await this.$store.dispatch('user/resetToken')//
this.$router.push(`/menu?redirect=/`)//
}
}
}

@ -16,7 +16,7 @@
</template>
<script>
// import { updatePassword } from '@/api/user'
import { updatePassword } from '@/api/user'
export default {
data() {
@ -38,14 +38,15 @@ export default {
})
return
}
// updatePassword(this.modifyForm).then(response => {
// this.$message({
// message: '',
// type: 'success',
// duration: 5 * 1000
// })
// this.$router.push({ path: '/dashboard' })
// })
updatePassword(this.modifyForm).then(response => {
this.$message({
message: '修改密码成功!',
type: 'success',
duration: 5 * 1000
})
this.$store.dispatch('user/resetToken')//
this.$router.push(`/menu?redirect=/`)//
})
}
}
}

@ -10,7 +10,7 @@
</div>
<div class="box-center">
<div class="user-name text-center">{{ user.name }}</div>
<div class="user-role text-center text-muted">大连船舶重工集团舾装有限公司</div>
<div class="user-role text-center text-muted">大连钢材加工配送有限公司</div>
</div>
</div>

@ -0,0 +1,497 @@
<template>
<!-- 设备加工人员维护 -->
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="工序名称:">
<el-select v-model="request.gx" placeholder="工序名称" clearable>
<el-option
v-for="item in gxOptions"
:key="item.value"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
</el-col>
<el-col :span="16" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('insert')"
>添加</el-button
>
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<el-button type="danger" @click="toolbarButtonClickEvent('delete')"
>删除</el-button
>
<el-button type="primary" @click="toolbarButtonClickEvent('save')"
>保存</el-button
>
</el-col>
</el-row>
</el-form>
</el-header>
<el-container style="padding-top: 10px">
<el-container>
<el-main>
<div class="mytable">
<vxe-grid
id="id"
ref="tableRef"
border
resizable
keep-source
:height="height"
:auto-resize="true"
:align="'center'"
:columns="tableColumn"
:data="list"
:custom-config="{ storage: true }"
:edit-config="{
trigger: 'click',
mode: 'row',
showStatus: true,
}"
:span-method="rowspanMethod"
:scroll-y="{enabled: false}"
highlight-hover-row
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
>
</vxe-grid>
</div>
</el-main>
</el-container>
</el-container>
</el-container>
</template>
<script>
import {
getSbjgrys,
} from "@/api/sjzx/sbryWH";
export default {
name: "SbjgryWH",
data() {
return {
request: {
gx: "",
},
list: [],
height: "500px",
tableColumn: [
{ type: "checkbox", width: "50", align: "center" },
{ type: "seq", width: "50", title: "序号", align: "center" },
{ field: 'dlzh', title: '登录账户', width: 160,editRender: { name: "$input"},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'employeeNumber', title: '职号', width: 160,editRender: { name: "$input"},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gx', title: '工序', width: 160,formatter:['dictFormat','PCGX'],
editRender: {
name: "$select",
options: [],
props: { clearable: true },
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xjsj', title: '休假时间', width: 160,
editRender: { name: "$input",
props: { type: 'date',labelFormat:"yyyy/MM/dd",start:"2024/03/13" ,end:"2024/03/14"}
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sb', title: '默认设备', width: 160,formatter:['dictFormat','PCGX'],
editRender: {
name: "$select",
options: [],
props: { clearable: true },
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 160,formatter:['dictFormat','PCGX'],
editRender: {
name: "$select",
options: [],
props: { clearable: true },
},
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
gxOptions: [],
ztOptions: [
{
label: '在职',
value: 0,
},
{
label: '离职',
value: 1,
},
],
departmentOptions: [],
options: [],
sbmcOptions: [],
checkedList: [],
};
},
created() {
window.addEventListener("resize", this.getHeight);
this.getHeight();
this.initList();
this.initgxList();
// this.emSbjbbZM("QGKW");
// this.emSbjbbZM("bmbm");
// this.getBMMCBM();
},
methods: {
initgxList(){
const dict=window.localStorage.getItem( 'PCGX');
const gxList =JSON.parse(dict)
this.$nextTick(() => {
const tableRef = this.$refs.tableRef;
const gx = tableRef.getColumnByField("gx");
const zt = tableRef.getColumnByField("zt");
const testList = [];
for (let i = 0; i < gxList.length; i++) {
const temp = {
label: gxList[i].bmsm,
value: gxList[i].bm,
};
testList.push(temp);
}
this.gxOptions= testList;
gx.editRender.options = testList;
zt.editRender.options = this.ztOptions;
});
},
//
initList() {
getSbjgrys(this.request).then((res) => {
this.list = res.data;
this.checkedList = [];
});
},
//
getBMMCBM() {
getBMMCBM().then((res) => {
if (res.success) {
this.options = res.data;
}
});
},
//
emSbjbbZM(params) {
emSbjbbZM({
bmlb: params,
}).then((res) => {
const tableRef = this.$refs.tableRef;
if (params == "bmbm") {
//
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;
}
});
},
//
changeSzcs(row, id) {
console.log(row, id);
if (row.row.szcs) {
row.row.sbmcDisabled = false;
row.row.sbmc = "";
row.row.sbbh = "";
this.sbmcOptions = [];
const testList = [];
console.log(this.options, "======");
for (let i = 0; i < this.options[id.value].length; i++) {
const temp = {
label: this.options[id.value][i].sbmc,
value: this.options[id.value][i].sbbh,
};
testList.push(temp);
}
this.sbmcOptions = testList;
} else {
row.row.sbmcDisabled = true;
row.row.sbmc = "";
row.row.sbbh = "";
this.sbmcOptions = [];
}
},
//
changeSbmc(event, row) {
if (row.sbmc) {
row.sbbh = event.value;
let arr = this.sbmcOptions.filter((item, index) => {
if (item.value == event.value) {
return item;
}
});
row.sbmc = arr[0].label;
} else {
row.sbbh = "";
}
},
//
selectAllEvent() {
const records = this.$refs.tableRef.getCheckboxRecords();
this.checkedList = records;
},
//
selectChangeEvent() {
const records = this.$refs.tableRef.getCheckboxRecords();
this.checkedList = records;
},
//
async toolbarButtonClickEvent(code) {
const { insertRecords, removeRecords, updateRecords } =
this.$refs.tableRef.getRecordset();
switch (code) {
case "insert":
this.$refs.tableRef.insertAt({ sbmcDisabled: true }, -1);
break;
case "delete":
if (this.checkedList.length > 0) {
this.$refs.tableRef.removeCheckboxRow();
} else {
this.$message.warning("请选择数据!");
}
break;
case "save":
const valid = this.$refs.tableRef;
let flag = false;
if (valid) {
const errMap = await valid.validate(true);
if (errMap) {
return false;
} else {
//
if (insertRecords.length !== 0) {
for(let i = 0; i < insertRecords.length; i++){
if(insertRecords[i].tzbh === undefined || insertRecords[i].tzbh === "" || insertRecords[i].tzbh === null){
flag = true;
break;
}
if(insertRecords[i].zl === undefined || insertRecords[i].zl === "" || insertRecords[i].zl === null){
flag = true;
break;
}
if(insertRecords[i].jgsx === undefined || insertRecords[i].jgsx === "" || insertRecords[i].jgsx === null){
flag = true;
break;
}
if(insertRecords[i].gx === undefined || insertRecords[i].gx === "" || insertRecords[i].gx === null){
flag = true;
break;
}
if(insertRecords[i].jldw === undefined || insertRecords[i].jldw === "" || insertRecords[i].jldw === null){
flag = true;
break;
}
if(insertRecords[i].degs === undefined || insertRecords[i].degs === "" || insertRecords[i].degs === null){
flag = true;
break;
}
}
if(flag){
this.$message.error({message:"新增内容未达到可保存标准,请把必要信息空白补全。"})
}else{
save(insertRecords).then((res) => {
if (res.success) {
this.list = this.list.concat(insertRecords);
const xTable = this.$refs.tableRef;
xTable.loadData(this.initList());
this.$message({
message: "保存成功!",
type: "success",
});
}
});
}
}
//
if (updateRecords.length !== 0) {
for(let i = 0; i < insertRecords.length; i++){
if(insertRecords[i].tzbh === undefined || insertRecords[i].tzbh === "" || insertRecords[i].tzbh === null){
flag = true;
break;
}
if(insertRecords[i].zl === undefined || insertRecords[i].zl === "" || insertRecords[i].zl === null){
flag = true;
break;
}
if(insertRecords[i].jgsx === undefined || insertRecords[i].jgsx === "" || insertRecords[i].jgsx === null){
flag = true;
break;
}
if(insertRecords[i].gx === undefined || insertRecords[i].gx === "" || insertRecords[i].gx === null){
flag = true;
break;
}
if(insertRecords[i].jldw === undefined || insertRecords[i].jldw === "" || insertRecords[i].jldw === null){
flag = true;
break;
}
if(insertRecords[i].degs === undefined || insertRecords[i].degs === "" || insertRecords[i].degs === null){
flag = true;
break;
}
}
if(flag){
this.$message.error({message:"保存内容未达到可保存标准,请把必要信息空白补全。"})
}else{
update(updateRecords).then((res) => {
if (res.success) {
const xTable = this.$refs.tableRef;
xTable.loadData(this.initList());
this.$message({ message: "保存成功!", type: "success" });
}
});
}
}
}
}
//
if (removeRecords.length !== 0) {
delete1(removeRecords).then((res) => {
if (res.success) {
for (let i = 0; i < this.list.length; i++) {
if (removeRecords.indexOf(this.list[i]) !== -1) {
this.list.splice(i, 1);
i--;
}
}
const xTable = this.$refs.tableRef;
xTable.loadData(this.initList());
this.$message({ message: "保存成功!", type: "success" });
}
});
}
// if (removeRecords.length !== 0) {
// this.$message(
// ` ${insertRecords.length} ${removeRecords.length} ${updateRecords.length} `
// );
// } else {
// const valid = this.$refs.tableRef;
// if (valid) {
// const errMap = await valid.validate(true);
// if (errMap) {
// return false;
// } else {
// this.$message(
// ` ${insertRecords.length} ${removeRecords.length} ${updateRecords.length} `
// );
// }
// }
// }
break;
}
},
//
rowspanMethod({row, _rowIndex, column, visibleData}) {
//vxe-grid :scroll-y="{enabled: false}"
//
let fields = ['tzbh'];//
const cellValue = row[column.property];//
if (cellValue && fields.includes(column.property)) {
const prevRow = visibleData[_rowIndex - 1];
let nextRow = visibleData[_rowIndex + 1];
if (prevRow && prevRow[column.property] === cellValue) {
//
return {rowspan: 0, colspan: 0};
} else {
//
let countRowspan = 1;
while (nextRow && nextRow[column.property] === cellValue) {
nextRow = visibleData[++countRowspan + _rowIndex];
}
if (countRowspan > 1) {
return {rowspan: countRowspan, colspan: 1};
}
}
}
},
getHeight() {
this.height = window.innerHeight - 160;
},
},
};
</script>
<style lang="scss" scoped>
.el-header {
margin: 0;
padding: 5px 0;
height: auto;
}
.el-container {
padding: 0;
margin: 0;
}
.el-main {
padding: 0;
}
.el-col {
padding: 0;
}
.el-aside {
background: #fff;
padding: 0;
}
.el-container {
padding: 0;
}
.el-row {
margin-bottom: 5px;
}
.el-row:last-child {
margin-bottom: 0;
}
.tableStyles {
background: #0a76a4;
}
.my-dropdown {
width: 450px;
height: 250px;
background-color: #fff;
border: 1px solid #dcdfe6;
box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
font-size: 12px;
}
::v-deep .mytable .vxe-input {
display: flex !important;
}
::v-deep .el-form-item {
margin-bottom: 0px !important;
}
::v-deep .el-input {
width: auto !important;
}
</style>

@ -312,6 +312,32 @@ export default {
},
{
field: "sbzt",
title: "固定资产状态",
align: "center",
editRender: {
name: "$select",
options: [],
props: { clearable: true },
},
minWidth: "120",
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{
field: "sbyxzt",
title: "设备状态",
align: "center",
editRender: {
@ -336,6 +362,28 @@ export default {
],
filterRender: { name: "FilterCombination" },
},
{
field: "whsj",
title: "维护时间范围",
align: "center",
editRender: { name: "input" },
minWidth: "110",
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{
field: "sbfl",
title: "设备大类",
@ -961,6 +1009,12 @@ export default {
checkedList: [],
sbbhDisabled: true,
zdDisabled: true,
sbyxztList:[
{label: '正常',
value: '0'},
{label: '维护',
value: '1'}
],
};
},
created() {
@ -970,6 +1024,7 @@ export default {
this.getSBLX();
this.emSbjbbZM("jldw");
this.emSbjbbZM("sbzt");
this.emSbjbbZM("sbyxzt");
this.emSbjbbZM("bmbm");
this.initList();
},
@ -1075,6 +1130,17 @@ export default {
testList.push(temp);
}
sbztText.editRender.options = testList;
}else if (params == "sbyxzt") {
const sbyxztText = tableRef.getColumnByField("sbyxzt");
const testList = [];
for (let i = 0; i < this.sbyxztList.length; i++) {
const temp = {
label: this.sbyxztList[i].label,
value: this.sbyxztList[i].value,
};
testList.push(temp);
}
sbyxztText.editRender.options = testList;
}
});
},

@ -557,7 +557,8 @@ export default {
this.$message({ message: '从工作组移除子系统权限成功!', type: 'success' })
})
}
}, handleGnqxSelect(row) {
},
handleGnqxSelect(row) {
let gnlb=''
if (row.gnlb){
gnlb=row.gnlb

@ -87,10 +87,10 @@
/>
</el-select>
</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 v-show="!inputDisabled">
<span style="width: 110px;display:inline-block;">密码</span>
<el-input placeholder="默认无密码" style="width: 250px;" disabled="false"/>
</el-row>
<el-row>
<span style="width: 110px;display:inline-block;">审批权限</span>
<el-select v-model="updateData.ylzd1" clearable placeholder="权限" style="width: 250px;">
@ -325,36 +325,6 @@ export default {
this.$message({ message: '添加用户信息成功!', type: 'success' })
})
},
addFinger(){
var uuid = updateGuid();
window.location.href="zwlr://"+this.updateData.user_code+uuid;
//this.selectYhxx.fingerprint='1111'
this.dialogVisible = false
console.log(this.updateData)
},
addFinger1(){
var uuid = updateGuid1();
window.location.href="zwlr://"+this.updateData.user_code+uuid;
//this.selectYhxx.fingerprint='1111'
this.dialogVisible = false
console.log(this.updateData)
},
addFinger2(){
var uuid = updateGuid2();
window.location.href="zwlr://"+this.updateData.user_code+uuid;
//this.selectYhxx.fingerprint='1111'
this.dialogVisible = false
console.log(this.updateData)
},
handleUpdateYhxx() {
if (!this.selectYhxx.yhdm) {
this.$message({ message: '请选择要修改的用户!', type: 'error' })

Loading…
Cancel
Save