部分bug

This commit is contained in:
helloDy
2023-11-24 19:01:25 +08:00
parent 8004c85c32
commit 9eea7e049a
14 changed files with 102 additions and 66 deletions

View File

@@ -144,8 +144,8 @@ export default {
getDataList() {
this.dataListLoading = true;
this.urlOptions.getDataListURL(this.listQuery).then(response => {
this.tableData = response.data.list;
// this.getStatus(response.data.list)
// this.tableData = response.data.list;
this.getStatus(response.data.list)
this.listQuery.total = response.data.total;
this.dataListLoading = false;
});

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2023-11-20 16:51:24
* @LastEditTime: 2023-11-24 18:20:26
* @Description:
-->
<template>
@@ -29,11 +29,10 @@
<div class="action_btn">
<template>
<span style="display: inline-block;" @click="addNew()">
<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
<span class="add">添加</span>
</span>
</template>
<span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
</span>
</template>
</div>
<base-table
:table-props="tableProps"
@@ -298,7 +297,7 @@ export default {
}
.action_btn {
float: right;
margin: 5px 15px;
margin: -40px 15px;
font-size: 14px;
}
.add {

View File

@@ -311,11 +311,11 @@ export default {
if (val) {
this.productList.map(item => {
if (val === item.id) {
this.dataForm.productSpec = item.specifications
this.dataForm.specifications = item.specifications
}
})
} else {
this.dataForm.productSpec = ''
this.dataForm.specifications = ''
}
}
}

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2023-11-22 10:26:58
* @LastEditTime: 2023-11-24 18:13:02
* @Description:
-->
<template>
@@ -196,7 +196,7 @@ export default {
workCost: undefined,
remark: undefined,
},
majorIdList: undefined,
majorIdList: [],
departmentlList: [],
menuOptions: [],
bindIds: [],
@@ -267,7 +267,7 @@ export default {
workCost: undefined,
remark: undefined
}
this.majorIdList = undefined
this.majorIdList = []
},
// 表单提交
dataFormSubmit() {
@@ -288,24 +288,28 @@ export default {
this.visible = false;
this.$emit("refreshDataList");
});
this.majorIdList.forEach(majorId => {
createWoBindMa({
workerId: this.dataForm.id,
majorId: majorId
}).then(res => {})
});
if (this.majorIdList.length > 0) {
this.majorIdList.forEach(majorId => {
createWoBindMa({
workerId: this.dataForm.id,
majorId: majorId
}).then(res => {})
});
}
return;
}
// 添加的提交
this.urlOptions.createURL(this.dataForm).then(response => {
// response.data = id
this.workerId = response.data
this.majorIdList.forEach(majorId => {
createWoBindMa({
workerId: this.workerId,
majorId: majorId
}).then(res => {})
});
if (this.majorIdList.length > 0) {
this.majorIdList.forEach(majorId => {
createWoBindMa({
workerId: this.workerId,
majorId: majorId
}).then(res => {})
});
}
this.$modal.msgSuccess("新增成功");
this.visible = false;
this.$emit("refreshDataList");
@@ -324,6 +328,7 @@ export default {
if (this.dataForm.id) {
this.urlOptions.infoURL(id).then(response => {
this.dataForm = response.data;
this.dataForm.departmentName = undefined
});
// 获取员工--专业
getWoBindMaPage({