DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(订单明细): 添加删除订单明细功能

Browse Source 
feat(辅料管理): 新增辅料变动记录功能

feat(仪表拓扑): 在仪表标签中显示上次抄表记录

fix(设备管理): 修复图片预览空值问题

refactor(员工管理): 部门树显示负责人信息

style(备件变动): 优化备件变动页面布局

docs(订单记录): 更新操作类型映射表

test(销售异议): 新增销售异议管理模块

chore: 更新.gitignore文件
This commit is contained in:
砂糖
2026-01-04 14:42:51 +08:00
parent aeecf4bcf7
commit 42dbbf79ae
16 changed files with 1724 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

253
klp-ui/src/views/mes/eqp/components/pages/auxiliaryChange.vue Normal file
View File

@@ -0,0 +1,253 @@
<template>
<div>
<el-form v-if="!auxiliaryId" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="关联备件" prop="auxiliaryId">
<el-select v-model="queryParams.auxiliaryId" placeholder="请选择关联备件">
<el-option v-for="item in auxiliaryList" :key="item.auxiliaryId" :label="item.auxiliaryName" :value="item.auxiliaryId" />
</el-select>
</el-form-item>
<el-form-item label="变动数量" prop="changeQuantity">
<el-input v-model="queryParams.changeQuantity" placeholder="请输入变动数量" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="变动原因" prop="reason">
<el-input v-model="queryParams.reason" placeholder="请输入变动原因" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="变动时间" prop="changeTime">
<el-date-picker clearable v-model="queryParams.changeTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择变动时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="AuxiliaryMaterialChangeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="关联辅料" align="center" prop="auxiliaryName" v-if="!auxiliaryId">
<template slot-scope="scope">
<span>{{ getAuxiliaryMaterialName(scope.row.auxiliaryId) }}</span>
</template>
</el-table-column>
<el-table-column label="变动类型" align="center" prop="changeType" />
<el-table-column label="变动数量" align="center" prop="changeQuantity" />
<el-table-column label="变动原因" align="center" prop="reason" />
<el-table-column label="变动时间" align="center" prop="changeTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import { listAuxiliaryMaterialChange, getAuxiliaryMaterialChange, delAuxiliaryMaterialChange, addAuxiliaryMaterialChange, updateAuxiliaryMaterialChange } from "@/api/mes/eqp/auxiliaryMaterialChange";
import { listAuxiliaryMaterial } from "@/api/mes/eqp/auxiliaryMaterial";
export default {
name: "AuxiliaryMaterialChange",
props: {
auxiliaryId: {
type: String,
default: undefined
}
},
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 备品备件变动记录表格数据
AuxiliaryMaterialChangeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
auxiliaryId: this.auxiliaryId,
changeType: undefined,
changeQuantity: undefined,
reason: undefined,
changeTime: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
},
partList: []
};
},
created() {
this.getList();
if (this.auxiliaryId) {
return;
}
this.getPartList();
},
watch: {
auxiliaryId: {
handler(newVal, oldVal) {
if (newVal !== oldVal && newVal !== undefined) {
this.queryParams.auxiliaryId = newVal;
this.getList();
}
},
immediate: true
}
},
methods: {
// 获取辅料名称
getAuxiliaryMaterialName(auxiliaryId) {
const auxiliary = this.partList.find(item => item.auxiliaryId == auxiliaryId);
return auxiliary ? auxiliary.auxiliaryName : '';
},
getPartList() {
listAuxiliaryMaterial({ pageNum: 1, pageSize: 1000 }).then(response => {
this.partList = response.rows;
});
},
/** 查询备品备件变动记录列表 */
getList() {
this.loading = true;
listAuxiliaryMaterialChange(this.queryParams).then(response => {
this.AuxiliaryMaterialChangeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
changeId: undefined,
auxiliaryId: this.auxiliaryId,
changeType: undefined,
changeQuantity: undefined,
reason: undefined,
changeTime: undefined,
createBy: undefined,
updateBy: undefined,
createTime: undefined,
updateTime: undefined,
delFlag: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.changeId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加备品备件变动记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const changeId = row.changeId || this.ids
getAuxiliaryMaterialChange(changeId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改备品备件变动记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.changeId != null) {
updateAuxiliaryMaterialChange(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addAuxiliaryMaterialChange(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const changeIds = row.changeId || this.ids;
this.$modal.confirm('是否确认删除备品备件变动记录编号为"' + changeIds + '"的数据项？').then(() => {
this.loading = true;
return delAuxiliaryMaterialChange(changeIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('eqp/AuxiliaryMaterialChange/export', {
...this.queryParams
}, `AuxiliaryMaterialChange_${new Date().getTime()}.xlsx`)
}
}
};
</script>

10
klp-ui/src/views/mes/eqp/components/pages/device.vue
View File

@@ -66,7 +66,7 @@
<el-table-column label="负责人" align="center" prop="manager" />
<el-table-column label="图片" align="center" prop="ossId" v-if="preview">
<template slot-scope="scope">
<image-preview :src="scope.row.ossId" fit="fill" />
<image-preview v-if="scope.row.ossId" :src="scope.row.ossId" fit="fill" />
</template>
</el-table-column>
<el-table-column label="启用时间" align="center" prop="enableTime" width="180" v-if="isInService">
@@ -78,13 +78,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="isInService" type="text" plain icon="el-icon-delete" size="mini" :loading="buttonLoading"
@click="handleSetStatus(scope.row)">
@click.stop="handleSetStatus(scope.row)">
停用
</el-button>
<el-button v-else size="mini" type="text" icon="el-icon-caret-right" :loading="buttonLoading"
@click="handleSetStatus(scope.row)">启用</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
@click.stop="handleSetStatus(scope.row)">启用</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

6
klp-ui/src/views/mes/eqp/components/pages/partChange.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div>
<el-form v-if="!partId" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关联备件" prop="partId">
<el-select v-model="queryParams.partId" placeholder="请选择关联备件">
@@ -51,7 +51,7 @@
<el-table v-loading="loading" :data="sparePartsChangeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="关联备件" align="center" prop="partName" />
<el-table-column label="关联备件" align="center" prop="partName" v-if="!partId" />
<el-table-column label="变动类型" align="center" prop="changeType" />
<el-table-column label="变动数量" align="center" prop="changeQuantity" />
<el-table-column label="变动原因" align="center" prop="reason" />
@@ -81,7 +81,7 @@ export default {
name: "SparePartsChange",
props: {
partId: {
type: Number,
type: String,
default: undefined
}
},