chuangte/yh-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
磷叶 2024-11-15 18:02:03 +08:00
parent 0f0b76724e
commit f64f14cf88
9 changed files with 615 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/api/yh/material.js Normal file
View File

@ -0,0 +1,52 @@
import request from '@/utils/request'
// 查询物料列表
export function listMaterial(query) {
return request({
url: '/yh/material/list',
method: 'get',
params: query
})
}
// 查询物料详细
export function getMaterial(id) {
return request({
url: '/yh/material/' + id,
method: 'get'
})
}
// 新增物料
export function addMaterial(data) {
return request({
url: '/yh/material',
method: 'post',
data: data
})
}
// 修改物料
export function updateMaterial(data) {
return request({
url: '/yh/material',
method: 'put',
data: data
})
}
// 同步物料
export function syncMaterial() {
return request({
url: '/yh/material/sync',
method: 'put'
})
}
// 删除物料
export function delMaterial(id) {
return request({
url: '/yh/material/' + id,
method: 'delete'
})
}

1
src/assets/icons/svg/material.svg Normal file
View File

@ -0,0 +1 @@
<svg t="1731400590157" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4282" width="64" height="64"><path d="M85.25 361.59l400.56 206.9a44.1 44.1 0 0 0 52.53-0.09l401.7-211a32 32 0 0 0 7.75-5.7 44.05 44.05 0 0 0 0-62.22 32 32 0 0 0-7.78-5.72L539.39 73.86a44.1 44.1 0 0 0-52.73 0.09l-401.77 214a32 32 0 0 0-7.58 5.62 44 44 0 0 0 0 62.23 32 32 0 0 0 7.94 5.79z m427.89-229.23l359.32 188.27L512 510 152.65 324.37zM946.73 668.33L512.62 896.76l-437.43-226c-10.31 12.45-18.76 55.47 3.76 71.11l416.76 215.58c6.83 4.47 25.52 4.46 32.47 0.33l418.16-219.33c25.66-13.35 13.99-60.77 0.39-70.12z" p-id="4283"></path><path d="M946.73 476L512.62 704.41l-437.43-226c-10.31 12.45-18.76 55.47 3.76 71.11L495.71 765.1c6.83 4.47 25.52 4.46 32.47 0.33L946.34 546.1c25.66-13.35 13.99-60.77 0.39-70.1z" p-id="4284"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 850 B

24
src/views/login.vue
View File

@ -1,7 +1,10 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">登录</h3>
<h3 class="title-box">
<img :src="logo" class="logo"/>
<span class="title">盈浩生产管理系统</span>
</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@ -66,12 +69,14 @@ import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
import Logo from "@/layout/components/Sidebar/Logo.vue";
import logoImg from "@/assets/logo/logo.png";
export default {
name: "Login",
components: {Logo},
data() {
return {
logo: logoImg,
codeUrl: "",
loginForm: {
username: "admin",
@ -166,15 +171,26 @@ export default {
background-image: url("../assets/images/login-background.webp");
background-size: cover;
}
.title {
.title-box {
margin: 0px auto 30px auto;
text-align: center;
color: #707070;
display: flex;
justify-content: center;
align-items: center;
line-height: 32px;
height: 32px;
.logo {
height: 32px;
width: 32px;
margin-right: 8px;
}
}
.login-form {
background: #ffffff;
width: 400px;
padding: 200px 25px 5px 25px;
width: fit-content;
padding: 200px 64px 5px;
position: absolute;
top: 0;
right: 0;

8
src/views/monitor/operlog/index.vue
View File

@ -123,6 +123,12 @@
<el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<el-table-column label="业务类型" align="center" prop="bizType">
<template slot-scope="d">
<dict-tag :options="dict.type.log_biz_type" :value="d.row.bizType"/>
</template>
</el-table-column>
<el-table-column label="业务ID" align="center" prop="bizIds" :show-overflow-tooltip="true" />
<el-table-column label="操作状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
@ -211,7 +217,7 @@ import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
export default {
name: "Operlog",
dicts: ['sys_oper_type', 'sys_common_status'],
dicts: ['sys_oper_type', 'sys_common_status', 'log_biz_type'],
data() {
return {
// 遮罩层

11
src/views/system/dept/index.vue
View File

@ -57,6 +57,8 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
<el-table-column prop="erpNumber" label="ERP部门编码" width="100"></el-table-column>
<el-table-column prop="erpId" label="ERP部门ID" width="100"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
@ -97,14 +99,19 @@
</el-table>
<!-- 添加或修改部门对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
<el-col :span="12" v-if="form.parentId !== 0">
<el-form-item label="上级部门" prop="parentId">
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="ERP部门编码" prop="erpNumber" label-width="7em">
<el-input v-model="form.erpNumber" placeholder="请输入ERP部门编码" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">

80
src/views/yh-ipad/report/index.vue
View File

@ -23,8 +23,42 @@
{{report.deptName}} {{report.reportDate}} 日报表
</el-col>
<el-col class="card-operator">
<el-button type="text" icon="el-icon-edit" class="card-btn" @click="handleUpdate(report)">编辑</el-button>
<el-button type="text" icon="el-icon-delete" class="card-btn" @click="handleDelete(report)">删除</el-button>
<el-button
type="text"
icon="el-icon-view"
@click="handleView(report)"
v-has-permi="['yh:report:query']"
>详情</el-button>
<el-button
type="text"
icon="el-icon-refresh"
@click="handleCancel(report)"
v-has-permi="['yh:report:cancel']"
v-show="ReportStatus.canCancel(report.status)"
>取消提交</el-button>
<el-button
type="text"
icon="el-icon-check"
@click="handleSubmit(report)"
v-has-permi="['yh:report:submit']"
v-show="ReportStatus.canSubmit(report.status)"
>提交</el-button>
<el-button
type="text"
icon="el-icon-edit"
class="card-btn"
@click="handleUpdate(report)"
v-has-permi="['yh:report:edit']"
v-show="ReportStatus.canEdit(report.status)"
>编辑</el-button>
<el-button
type="text"
icon="el-icon-delete"
class="card-btn"
@click="handleDelete(report)"
v-has-permi="['yh:report:remove']"
v-show="ReportStatus.canDel(report.status)"
>删除</el-button>
</el-col>
</el-row>
</template>
@ -54,7 +88,8 @@
</template>
<script>
import {$showColumns} from "@/utils/mixins";
import {delReport, listReport} from "@/api/yh/report";
import {cancelReport, delReport, listReport, submitReport} from "@/api/yh/report";
import {ReportStatus} from "@/utils/constants";
// 默认排序字段
const defaultSort = {
@ -63,10 +98,16 @@ const defaultSort = {
}
export default {
name: "IpadReport",
computed: {
ReportStatus() {
return ReportStatus
}
},
mixins: [$showColumns],
dicts: ['report_status'],
data() {
return {
row: {},
// 字段列表
columns: [
{key: 'reportId', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
@ -204,6 +245,39 @@ export default {
handleUpdate(row) {
this.$router.push(`/edit/report/${row.reportId}`)
},
// 提交报表
handleSubmit(row) {
this.$confirm('确定提交吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
submitReport(row.reportId).then(res => {
if (res.code === 200) {
this.$message.success("提交成功");
this.getList();
}
})
})
},
// 取消审核
handleCancel(row) {
this.$confirm('确定取消吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
cancelReport(row.reportId).then(res => {
if (res.code === 200) {
this.$message.success("取消成功");
this.getList();
}
})
})
},
handleView(row) {
this.$router.push(`/view/report/${row.reportId}`)
},
/** 删除按钮操作 */
handleDelete(row) {
const reportIds = row.reportId || this.ids;

376
src/views/yh/material/index.vue Normal file
View File

@ -0,0 +1,376 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="物料编码" prop="erpNumber">
<el-input
v-model="queryParams.erpNumber"
placeholder="请输入ERP物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="erpName">
<el-input
v-model="queryParams.erpName"
placeholder="请输入ERP物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料规格" prop="erpSpec">
<el-input
v-model="queryParams.erpSpec"
placeholder="请输入ERP物料规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格品类" prop="category">
<el-input
v-model="queryParams.category"
placeholder="请输入规格品类"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="大小" prop="size">
<el-input
v-model="queryParams.size"
placeholder="请输入大小"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="表面处理" prop="surface">
<el-input
v-model="queryParams.surface"
placeholder="请输入表面处理"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="盖子方式" prop="cover">
<el-input
v-model="queryParams.cover"
placeholder="请输入盖子方式"
clearable
@keyup.enter.native="handleQuery"
/>
</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="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-has-permi="['yh:material:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-has-permi="['yh:material:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-has-permi="['yh:material:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-refresh"
size="mini"
@click="handleSync"
v-has-permi="['yh:material:sync']"
>同步</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" />
<template v-for="column of showColumns">
<el-table-column
:key="column.key"
:label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
:width="column.width"
>
<template slot-scope="d">
<template v-if="column.key === 'id'">
{{d.row[column.key]}}
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-has-permi="['yh:material:edit']"-->
<!-- >修改</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-has-permi="['yh:material:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改物料对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<form-col :span="span" label="ERP物料编码" prop="erpNumber">
<el-input v-model="form.erpNumber" placeholder="请输入ERP物料编码" />
</form-col>
<form-col :span="span" label="ERP物料名称" prop="erpName">
<el-input v-model="form.erpName" placeholder="请输入ERP物料名称" />
</form-col>
<form-col :span="span" label="ERP物料规格" prop="erpSpec">
<el-input v-model="form.erpSpec" placeholder="请输入ERP物料规格" />
</form-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial, syncMaterial} from "@/api/yh/material";
import { $showColumns } from '@/utils/mixins';
import FormCol from "@/components/FormCol/index.vue";
import {syncProdOrder} from "@/api/yh/prodOrder";
// 默认排序字段
const defaultSort = {
prop: "id",
order: "descending"
}
export default {
name: "Material",
mixins: [$showColumns],
components: {FormCol},
data() {
return {
span: 24,
// 字段列表
columns: [
{key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'erpId', visible: false, label: 'ERP物料ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpNumber', visible: true, label: '物料编码', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpName', visible: true, label: '名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpSpec', visible: true, label: '规格', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'workShops', visible: true, label: '车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'category', visible: true, label: '规格品类', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'size', visible: true, label: '大小', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'surface', visible: true, label: '表面处理', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'cover', visible: true, label: '盖子方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 物料表格数据
materialList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
defaultSort,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
id: null,
erpNumber: null,
erpName: null,
erpSpec: null
},
// 表单参数
form: {},
// 表单校验
rules: {
erpNumber: [
{ required: true, message: "ERP物料编码不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
handleSync() {
syncMaterial().then(res => {
if (res.code === 200) {
this.$message.success("同步成功");
}
})
},
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询物料列表 */
getList() {
this.loading = true;
listMaterial(this.queryParams).then(response => {
this.materialList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
erpNumber: null,
erpName: null,
erpSpec: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加物料";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getMaterial(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改物料";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateMaterial(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addMaterial(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除物料编号为"' + ids + '"的数据项？').then(function() {
return delMaterial(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('yh/material/export', {
...this.queryParams
}, `material_${new Date().getTime()}.xlsx`)
}
}
};
</script>

158
src/views/yh/prodOrder/index.vue
View File

@ -1,80 +1,54 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="单据编号" prop="billNo">
<el-form-item label="单据ID" prop="erpId">
<el-input
v-model="queryParams.billNo"
placeholder="请输入单据编号"
v-model="queryParams.erpId"
placeholder="请输入ERP单据ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-form-item label="单据编号" prop="erpBillNo">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格型号"
v-model="queryParams.erpBillNo"
placeholder="请输入ERP单据编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产车间" prop="deptId">
<dept-tree-select v-model="queryParams.deptId" class="small-tree-select"/>
<el-form-item label="单据状态" prop="erpDocumentStatus">
<el-select v-model="queryParams.erpDocumentStatus" placeholder="请选择ERP单据状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.prod_order_erp_document_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="是否返工" prop="erpIsRework">
<el-radio-group v-model="queryParams.erpIsRework">
<el-radio :label="null">全部</el-radio>
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="批号" prop="batchNo">
<el-input
v-model="queryParams.batchNo"
placeholder="请输入批号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="业务状态" prop="erpStatus">
<el-select v-model="queryParams.erpStatus" placeholder="请选择ERP明细业务状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.prod_order_erp_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="下达时间" prop="releaseTime">
<el-date-picker clearable
v-model="queryParams.releaseTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择下达时间">
</el-date-picker>
</el-form-item>
<el-form-item label="源单编号" prop="sourceNo">
<el-input
v-model="queryParams.sourceNo"
placeholder="请输入源单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="需求单据" prop="demandBill">
<el-input
v-model="queryParams.demandBill"
placeholder="请输入需求单据"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计划跟踪号" prop="planTrackNo" label-width="6em">
<el-input
v-model="queryParams.planTrackNo"
placeholder="请输入计划跟踪号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="materialNo">
<el-input
v-model="queryParams.materialNo"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
<!-- <el-form-item label="部门" prop="deptId">-->
<!-- <dept-tree-select v-model="queryParams.deptId" class="small-tree-select"/>-->
<!-- </el-form-item>-->
<el-form-item label="生产车间" prop="erpWorkShopId">
<dept-tree-select class="small-tree-select" @select="onSelectWorkShop"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -145,8 +119,17 @@
<template v-if="column.key === 'id'">
{{d.row[column.key]}}
</template>
<template v-else-if="column.key === 'bizStatus'">
<dict-tag :value="d.row[column.key]" :options="dict.type.prod_order_biz_status"/>
<template v-else-if="column.key === 'erpDocumentStatus'">
<dict-tag :options="dict.type.prod_order_erp_document_status" :value="d.row[column.key]"/>
</template>
<template v-else-if="column.key === 'erpStatus'">
<dict-tag :options="dict.type.prod_order_erp_status" :value="d.row[column.key]"/>
</template>
<template v-else-if="column.key === 'erpReqSrc'">
<dict-tag :options="dict.type.prod_order_erp_req_src" :value="d.row[column.key]"/>
</template>
<template v-else-if="column.key === 'erpIsRework'">
<boolean-tag :value="d.row.erpIsRework"/>
</template>
<template v-else>
{{d.row[column.key]}}
@ -263,6 +246,7 @@ import {
import { $showColumns } from '@/utils/mixins';
import FormCol from "@/components/FormCol/index.vue";
import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
import BooleanTag from "@/components/BooleanTag/index.vue";
// 默认排序字段
const defaultSort = {
@ -273,8 +257,8 @@ const defaultSort = {
export default {
name: "ProdOrder",
mixins: [$showColumns],
dicts: ['prod_order_biz_status'],
components: {DeptTreeSelect, FormCol},
dicts: ['prod_order_erp_document_status', 'prod_order_erp_status', 'prod_order_erp_req_src'],
components: {BooleanTag, DeptTreeSelect, FormCol},
data() {
return {
span: 24,
@ -282,28 +266,24 @@ export default {
columns: [
{key: 'id', visible: false, label: '生产订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpId', visible: true, label: '单据ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'billNo', visible: true, label: '单据编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'type', visible: true, label: '单据类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'billDate', visible: true, label: '单据日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'status', visible: true, label: '单据状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'transferStatus', visible: true, label: '调拨状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'pickStatus', visible: true, label: '领料状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'materialName', visible: true, label: '物料名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'spec', visible: true, label: '规格型号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'unit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'num', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'bizStatus', visible: true, label: '业务状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'batchNo', visible: true, label: '批号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'releaseTime', visible: true, label: '下达时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'sourceNo', visible: true, label: '源单编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'demandBill', visible: true, label: '需求单据', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'planTrackNo', visible: true, label: '计划跟踪号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'productType', visible: true, label: '产品类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'materialNo', visible: true, label: '物料编码', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'quaStore', visible: true, label: '合格品入库数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'deptId', visible: true, label: '部门ID(本系统)', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpDeptId', visible: true, label: '部门ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpBillNo', visible: true, label: '单据编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'erpDocumentStatus', visible: true, label: '单据状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'erpCreateDate', visible: true, label: '创建日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'erpModifyDate', visible: true, label: '修改日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'erpDescription', visible: false, label: '主表备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpDate', visible: true, label: '单据日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'materialNumber', visible: true, label: '物料编码', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'erpIsRework', visible: true, label: '是否返工', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'erpRowId', visible: false, label: '行标识', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
{key: 'erpMemoItem', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'erpConveyDate', visible: true, label: '下达日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
{key: 'erpStatus', visible: true, label: '业务状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'workShopName', visible: true, label: '生产车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpReqSrc', visible: true, label: '需求来源', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpQty', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpBaseUnitQty', visible: true, label: '基本单位数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'erpUnitId', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'deptId', visible: false, label: '部门ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
@ -364,6 +344,10 @@ export default {
this.getList();
},
methods: {
onSelectWorkShop(dept) {
this.queryParams.erpWorkShopId = dept.erpId;
this.getList();
},
handleSync() {
syncProdOrder().then(res => {
if (res.code === 200) {

4
src/views/yh/report/view/view.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container" v-loading="loading">
<div style="display: flex;">
<div style="flex: 1">
<div style="display: flex; width: 100%; position: relative">
<div style="flex: 1;">
<el-card header="基本信息" class="card-box">
<el-descriptions :column="4">
<el-descriptions-item label="报表编号">{{detail.reportId | dv}}</el-descriptions-item>