待确认
This commit is contained in:
helloDy
@@ -14,7 +14,7 @@
|
||||
custom-class="mes-drawer"
|
||||
size="60%"
|
||||
@closed="$emit('destroy')">
|
||||
<SmallTitle slot="title">编辑</SmallTitle>
|
||||
<SmallTitle slot="title">{{ showTable ? '编辑' : '新增' }}</SmallTitle>
|
||||
|
||||
<div class="drawer-body flex">
|
||||
<div class="drawer-body__content">
|
||||
@@ -184,49 +184,53 @@
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
<SmallTitle>保养内容</SmallTitle>
|
||||
<div v-if="showTable">
|
||||
<SmallTitle>保养内容</SmallTitle>
|
||||
|
||||
<div style="margin-top: 12px; position: relative">
|
||||
<SearchBar
|
||||
:formConfigs="searchBarFormConfig"
|
||||
ref="attr-search-bar"
|
||||
@headBtnClick="handleSearchBarBtnClick" />
|
||||
</div>
|
||||
|
||||
<div style="margin-top: 12px; position: relative">
|
||||
<div style="position: absolute; top: -40px; right: 0">
|
||||
<el-button @click="handleAddAttr" type="text">
|
||||
<i class="el-icon-plus"></i>
|
||||
添加属性
|
||||
</el-button>
|
||||
<div style="margin-top: 12px; position: relative">
|
||||
<SearchBar
|
||||
:formConfigs="searchBarFormConfig"
|
||||
ref="attr-search-bar"
|
||||
@headBtnClick="handleSearchBarBtnClick" />
|
||||
</div>
|
||||
<base-table
|
||||
v-loading="attrListLoading"
|
||||
:table-props="attrTableProps"
|
||||
:page="attrQuery?.params.pageNo || 1"
|
||||
:limit="attrQuery?.params.pageSize || 10"
|
||||
:table-data="attrList"
|
||||
@emitFun="handleEmitFun">
|
||||
<method-btn
|
||||
slot="handleBtn"
|
||||
label="操作"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleTableBtnClick" />
|
||||
</base-table>
|
||||
|
||||
<!-- 分页组件 -->
|
||||
<pagination
|
||||
v-show="attrTotal > 0"
|
||||
:total="attrTotal"
|
||||
:page.sync="attrQuery.params.pageNo"
|
||||
:limit.sync="attrQuery.params.pageSize"
|
||||
@pagination="getAttrList" />
|
||||
<div style="margin-top: 12px; position: relative">
|
||||
<div style="position: absolute; top: -40px; right: 0">
|
||||
<el-button @click="handleAddAttr" type="text">
|
||||
<i class="el-icon-plus"></i>
|
||||
添加属性
|
||||
</el-button>
|
||||
</div>
|
||||
<base-table
|
||||
v-loading="attrListLoading"
|
||||
:table-props="attrTableProps"
|
||||
:page="attrQuery?.params.pageNo || 1"
|
||||
:limit="attrQuery?.params.pageSize || 10"
|
||||
:table-data="attrList"
|
||||
@emitFun="handleEmitFun">
|
||||
<method-btn
|
||||
slot="handleBtn"
|
||||
label="操作"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleTableBtnClick" />
|
||||
</base-table>
|
||||
|
||||
<!-- 分页组件 -->
|
||||
<pagination
|
||||
v-show="attrTotal > 0"
|
||||
:total="attrTotal"
|
||||
:page.sync="attrQuery.params.pageNo"
|
||||
:limit.sync="attrQuery.params.pageSize"
|
||||
@pagination="getAttrList" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="drawer-body__footer">
|
||||
<el-button style="" @click="handleCancel">取消</el-button>
|
||||
<el-button type="primary" @click="handleConfirm">保存</el-button>
|
||||
<!-- 新增可确认 -->
|
||||
<el-button v-if="isAdd" type="primary" @click="addConfirm">保存</el-button>
|
||||
<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
|
||||
<!-- sections的第二项必须是 属性列表 -->
|
||||
<!-- <el-button
|
||||
v-if="sections[1].allowAdd"
|
||||
@@ -292,6 +296,8 @@ export default {
|
||||
return {
|
||||
visible: false,
|
||||
btnLoading: false,
|
||||
showTable: false,
|
||||
isAdd: false,
|
||||
form: {},
|
||||
formLoading: false,
|
||||
lineList: [],
|
||||
@@ -387,7 +393,7 @@ export default {
|
||||
attrListLoading: false,
|
||||
// syncFileListFlag: null,
|
||||
tableBtn: [],
|
||||
row: null,
|
||||
row: {},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@@ -438,23 +444,106 @@ export default {
|
||||
break;
|
||||
}
|
||||
},
|
||||
async addConfirm() {
|
||||
console.log('11', this.showTable)
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.getConfirmed().then(confirm => {
|
||||
console.log('111', confirm)
|
||||
this.$axios({
|
||||
url:
|
||||
'/base/equipment-maintain-log/confirm?confirmPerson=' +
|
||||
this.$store.getters.userId,
|
||||
method: 'put',
|
||||
data: [this.form.id],
|
||||
}).then(res =>{
|
||||
if (res.code == 0) {
|
||||
this.visible = false;
|
||||
this.$emit("refreshDataList");
|
||||
this.$message.success('已确认');
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
this.visible = false;
|
||||
this.$emit("refreshDataList");
|
||||
this.$message.success('取消确认');
|
||||
})
|
||||
})
|
||||
});
|
||||
},
|
||||
getConfirmed() {
|
||||
return this.$confirm('是否直接确认保养记录', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
});
|
||||
},
|
||||
async handleConfirm() {
|
||||
this.btnLoading = true;
|
||||
this.$nextTick(async () => {
|
||||
const { code, data } = await this.$axios({
|
||||
url: '/base/equipment-maintain-log/update',
|
||||
method: 'put',
|
||||
// this.$nextTick(async () => {
|
||||
// const { code, data } = await this.$axios({
|
||||
// url: '/base/equipment-maintain-log/update',
|
||||
// method: 'put',
|
||||
// data: {
|
||||
// ...this.form,
|
||||
// maintainWorker: this.form.maintainWorker.join(',')
|
||||
// },
|
||||
// });
|
||||
// if (code == 0) {
|
||||
// this.$modal.msgSuccess('更新成功');
|
||||
// }
|
||||
// this.btnLoading = false;
|
||||
// this.$emit('refreshDataList');
|
||||
// this.handleCancel();
|
||||
// });
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
// 修改的提交
|
||||
if (this.form.id != null) {
|
||||
this.$axios({
|
||||
url: '/base/equipment-maintain-log/update',
|
||||
method: 'put',
|
||||
data: {
|
||||
...this.form,
|
||||
maintainWorker: this.form.maintainWorker.join(','),
|
||||
special: false,
|
||||
relatePlan: 2
|
||||
}
|
||||
}).then((response) => {
|
||||
this.$modal.msgSuccess('修改成功');
|
||||
this.btnLoading = false;
|
||||
this.$emit('refreshDataList');
|
||||
this.handleCancel();
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 添加的提交
|
||||
this.$axios({
|
||||
url: '/base/equipment-maintain-log/create',
|
||||
method: 'post',
|
||||
data: {
|
||||
...this.form,
|
||||
maintainWorker: this.form.maintainWorker.join(',')
|
||||
},
|
||||
maintainWorker: this.form.maintainWorker.join(','),
|
||||
special: false,
|
||||
relatePlan: 2,
|
||||
confirmed: false,
|
||||
}
|
||||
}).then((response) => {
|
||||
this.$modal.msgSuccess('新增成功');
|
||||
this.btnLoading = false;
|
||||
this.form.id = response.data
|
||||
this.row.id = response.data
|
||||
this.showTable = true
|
||||
this.isAdd = true
|
||||
this.$emit('refreshDataList');
|
||||
// this.handleCancel();
|
||||
});
|
||||
if (code == 0) {
|
||||
this.$modal.msgSuccess('更新成功');
|
||||
}
|
||||
this.btnLoading = false;
|
||||
this.$emit('refreshDataList');
|
||||
this.handleCancel();
|
||||
});
|
||||
},
|
||||
|
||||
@@ -464,15 +553,22 @@ export default {
|
||||
|
||||
init(row) {
|
||||
this.visible = true;
|
||||
this.row = row;
|
||||
this.getInfo(row);
|
||||
this.getAttrList(row);
|
||||
if (row) {
|
||||
this.row = row;
|
||||
this.showTable = row ? true : false;
|
||||
this.$nextTick(() => {
|
||||
if (row.id) {
|
||||
this.getInfo(row.id);
|
||||
this.getAttrList(row.id);
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
async getInfo(row) {
|
||||
async getInfo(id) {
|
||||
this.formLoading = true;
|
||||
const res = await this.$axios(
|
||||
'/base/equipment-maintain-log/get?id=' + row.id
|
||||
'/base/equipment-maintain-log/get?id=' + id
|
||||
);
|
||||
if (res.code == 0) {
|
||||
this.form = res.data;
|
||||
@@ -482,15 +578,15 @@ export default {
|
||||
this.formLoading = false;
|
||||
},
|
||||
|
||||
async getAttrList(row, condition = {}) {
|
||||
if (!row) row = this.row;
|
||||
async getAttrList(id, condition = {}) {
|
||||
if (!id) id = this.row.id;
|
||||
this.attrListLoading = true;
|
||||
const res = await this.$axios({
|
||||
url: '/base/equipment-maintain-log-det/page',
|
||||
method: 'get',
|
||||
params: {
|
||||
...this.attrQuery.params,
|
||||
logId: row.id,
|
||||
logId: id,
|
||||
...condition,
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user