add 窑炉订单和检测包装订单

This commit is contained in:
lb 2023-03-13 11:11:20 +08:00
parent 8e5f668a41
commit 24bf76f9cf
6 changed files with 558 additions and 5 deletions

View File

@ -5,12 +5,12 @@
:data="tableData"
v-bind="tableConfig"
ref="base-list-table"
:cell-style="{ padding: 0 }"
:header-cell-style="/** 重写表格样式 **/ {
padding: '8px 0',
}"
row-key="id"
>
<!-- :cell-style="{ padding: 0 }" -->
<!-- @cell-mouse-enter="(row, col, cell, event) => $emit('cell-mouse-enter', row, col, cell, event)"> -->
<!-- @cell-mouse-leave="(row, col, cell, event) => $emit('cell-mouse-leave', row, col, cell, event)"> -->
<!-- 表格头定义 -->

View File

@ -30,14 +30,14 @@
<DialogWithMenu
ref="edit-dialog"
v-if="dialogType === DIALOG_WITH_MENU"
v-if="!!dialogConfigs && dialogType === DIALOG_WITH_MENU"
:dialog-visible.sync="dialogVisible"
:configs="dialogConfigs"
@refreshDataList="getList"
/>
<DialogJustForm
ref="edit-dialog"
v-if="dialogType === DIALOG_JUST_FORM"
v-if="!!dialogConfigs && dialogType === DIALOG_JUST_FORM"
:dialog-visible.sync="dialogVisible"
:configs="dialogConfigs"
@refreshDataList="getList"
@ -79,7 +79,7 @@ export default {
/** dialog configs 或许可以从 tableConfig 计算出来 computed... */
dialogConfigs: {
type: Object,
default: () => ({}),
default: () => null
},
},
computed: {

View File

@ -0,0 +1,221 @@
// import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
// import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
// import StatusComponent from "@/components/noTemplateComponents/statusComponent";
import { timeFilter } from "@/utils/filters";
export default function () {
const tableProps = [
{ type: "index", label: "序号" },
{ width: 160, prop: "createTime", label: "添加时间", filter: timeFilter },
{ prop: "kilnCode", label: "窑炉" },
{ prop: "orderCode", label: "主订单号" },
{ prop: "orderCate", label: "主订单子号" },
{ width: 160, prop: "code", label: "烧成订单号" },
{ prop: "statusDictValue", label: "订单状态", filter: (val) => (val !== null && val !== undefined ? ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝"][val] : "-"), },
{ prop: "startTime", label: "开始时间" },
{ prop: "bomCode", label: "配方" },
{ prop: "ai", label: "版本号" },
{ prop: "qty", label: "压制数量" },
{ prop: "qtyComplete", label: "完成数量" },
{ prop: "percent", label: "完成进度", filter: (val) => (val !== null && val !== undefined ? val + " %" : "-") },
// { prop: "remark", label: "备注" },
// { prop: 'version', label: '配方号' },
// { prop: 'status', label: '状态', subcomponent: StatusComponent }, // subcomponent
// { prop: "description", label: "详情", subcomponent: TableTextComponent },
// {
// prop: "operations",
// name: "操作",
// fixed: "right",
// width: 160,
// subcomponent: TableOperaionComponent,
// options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
// },
];
const headFormFields = [
{
prop: "code",
label: "主订单号",
input: true,
default: { value: "" },
bind: {
placeholder: "请输入主订单号查询",
},
},
// {
// prop: "bom",
// label: "配方号",
// input: true,
// default: { value: "" },
// bind: {
// placeholder: "请输入配方号",
// },
// },
// {
// prop: 'bom',
// label: '配方号',
// input: true,
// default: { value: '' },
// bind: {
// placeholder: '请输入配方号'
// }
// },
{
button: {
type: "primary",
name: "查询",
},
},
// {
// button: {
// type: "plain",
// name: "新增",
// permission: "pms:blenderStep:save",
// },
// },
];
// const dialogConfigs = {
// extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
// menu: [
// { name: "烧制工艺", key: "info" },
// { name: "工艺参数", key: "attr", onlyEditMode: true },
// ],
// form: {
// rows: [
// [
// {
// input: true,
// label: "工艺名称",
// prop: "name",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入烧制工艺名称" },
// },
// {
// input: true,
// label: "工艺编码",
// prop: "code",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入烧制工艺编码" },
// },
// {
// select: true,
// label: "配方",
// prop: "bomId",
// options: [],
// refreshOptionsAfterConfirm: true,
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { clearable: true, filterable: true, placeholder: "请选择配方" },
// fetchData: (techId = -1) => this.$http.get("/pms/bom/listUnR", { params: { wsId: 3, externalCode: '', key: '', techId } }),
// },
// ],
// // [
// // {
// // forceDisabled: true,
// // prop: 'bomCode',
// // label: '当前配方'
// // },
// // ],
// [{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
// ],
// operations: [
// { name: "add", label: "保存", type: "primary", permission: "pms:firingStep:save", showOnEdit: false },
// { name: "update", label: "更新", type: "primary", permission: "pms:firingStep:update", showOnEdit: true },
// { name: "reset", label: "重置", type: "warning", showAlways: true },
// // { name: 'cancel', label: '取消', showAlways: true },
// ],
// },
// table: {
// extraParams: ["techId", "key"],
// props: [
// // { type: 'index', label: '序号' },
// // { prop: "createTime", label: "添加时间", filter: timeFilter },
// { prop: "name", label: "参数名称", isEditField: true },
// { prop: "code", label: "参数编码", isEditField: true },
// // { prop: "specifications", label: "规格", isEditField: true },
// { prop: "value", label: "参数值", isEditField: true },
// { prop: "valueFloor", label: "参数值下限", isEditField: true },
// { prop: "valueTop", label: "参数值上限", isEditField: true },
// { prop: "description", label: "描述", isEditField: true },
// {
// prop: "operations",
// name: "操作",
// fixed: "right",
// width: 120,
// subcomponent: TableOperaionComponent,
// options: [
// { name: "edit", permission: "pms:blenderStepParam:update" },
// { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
// ],
// },
// ],
// data: [
// // TOOD 暂时用不到,但获取可以考虑把拉取接口数据的函数迁移到此文件(没有太大必要)
// ],
// },
// subDialog: {
// extraParam: "techId",
// rows: [
// [
// {
// input: true,
// label: "参数名称",
// prop: "name",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入参数名称" },
// },
// {
// input: true,
// label: "参数编码",
// prop: "code",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入参数编码" },
// },
// ],
// [
// { input: true, label: "参数值上限", prop: "valueTop", elparams: { placeholder: "请输入参数值上限" } },
// { input: true, label: "参数值下限", prop: "valueFloor", elparams: { placeholder: "请输入参数值下限" } },
// ],
// [
// { input: true, label: "参数值", prop: "value", elparams: { placeholder: "请输入参数值" } },
// {
// input: true,
// label: "描述",
// prop: "description",
// // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入描述" },
// },
// ],
// ],
// operations: [
// { name: "add", label: "保存", type: "primary", showOnEdit: false },
// { name: "update", label: "更新", type: "primary", showOnEdit: true },
// // { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
// // { name: 'reset', label: '重置', type: 'warning', showAlways: true },
// // { name: 'cancel', label: '取消', showAlways: true },
// ],
// },
// };
return {
// dialogConfigs,
tableConfig: {
table: null, // 此处可省略el-table 上的配置项
column: tableProps, // el-column-item 上的配置项
},
headFormConfigs: {
rules: null, // 名称是由 BaseSearchForm.vue 组件固定的
fields: headFormFields, // 名称是由 BaseSearchForm.vue 组件固定的
},
urls: {
// base: "/pms/equipmentTech",
page: "/pms/kilnOrder/pageView",
pageIsPostApi: true, // 使用post接口来获取page数据极少用目前基本上只有工艺管理模块里在用
// subase: "/pms/equipmentTechParam",
// subpage: "/pms/equipmentTechParam/page",
// copyUrl: "/pms/equipmentTech/copy",
// more...
},
};
}

View File

@ -0,0 +1,51 @@
<template>
<ListViewWithHead
:table-config="tableConfig"
:head-config="headFormConfigs"
:dialog-configs="dialogConfigs"
:list-query-extra="[]"
/>
</template>
<script>
import initConfig from "./config";
import ListViewWithHead from "@/views/atomViews/ListViewWithHead.vue";
export default {
name: "BlenderView",
components: { ListViewWithHead },
provide() {
return {
urls: this.allUrls,
};
},
// urls: {
// type: Object,
// required: true,
// default: () => ({
// /** url **/ list: null,
// /** url **/ page: null,
// /** url **/ edit: null,
// /** url **/ delete: null,
// /** url **/ detail: null,
// /** url **/ export: null,
// /** url **/ import: null,
// /** url **/ other: null,
// }),
// },
data() {
const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
return {
tableConfig,
headFormConfigs,
allUrls: urls,
dialogConfigs,
};
},
created() {},
mounted() {},
methods: {},
};
</script>
<style scoped></style>

View File

@ -0,0 +1,230 @@
// import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
// import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
// import StatusComponent from "@/components/noTemplateComponents/statusComponent";
import { timeFilter } from "@/utils/filters";
export default function () {
const tableProps = [
{ type: "index", label: "序号" },
{ width: 160, prop: "createTime", label: "添加时间", filter: timeFilter },
{ prop: "kilnCode", label: "窑炉" },
{ width: 100, prop: "orderCode", label: "主订单号" },
{ width: 120, prop: "orderCate", label: "主订单子号" },
{ width: 160, prop: "code", label: "检测包装订单号" },
{
prop: "statusDictValue",
label: "订单状态",
filter: (val) => (val !== null && val !== undefined ? ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝"][val] : "-"),
},
{ width: 120, prop: "startTime", label: "开始时间" },
{ width: 120, prop: "shapeCode", label: "砖型" },
{ prop: "ai", label: "版本号" },
{ width: 120, prop: "qty1", label: "检测要求数量" },
{ width: 120, prop: "qty1Complete", label: "检测完成数量" },
{ width: 120, prop: "goodqty1", label: "检测合格量" },
{ width: 120, prop: "badqty1", label: "检测不合格量" },
{ width: 120, prop: "qty2", label: "包装要求数量" },
{ width: 120, prop: "qty2Complete", label: "包装完成数量" },
{ prop: "percent", label: "检测进度", filter: (val) => (val !== null && val !== undefined ? val + " %" : "-") },
{ prop: "percent2", label: "包装进度", filter: (val) => (val !== null && val !== undefined ? val + " %" : "-") },
// { prop: "remark", label: "备注" },
// { prop: 'version', label: '配方号' },
// { prop: 'status', label: '状态', subcomponent: StatusComponent }, // subcomponent
// { prop: "description", label: "详情", subcomponent: TableTextComponent },
// {
// prop: "operations",
// name: "操作",
// fixed: "right",
// width: 160,
// subcomponent: TableOperaionComponent,
// options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }],
// },
];
const headFormFields = [
{
prop: "code",
label: "主订单号",
input: true,
default: { value: "" },
bind: {
placeholder: "请输入主订单号查询",
},
},
// {
// prop: "bom",
// label: "配方号",
// input: true,
// default: { value: "" },
// bind: {
// placeholder: "请输入配方号",
// },
// },
// {
// prop: 'bom',
// label: '配方号',
// input: true,
// default: { value: '' },
// bind: {
// placeholder: '请输入配方号'
// }
// },
{
button: {
type: "primary",
name: "查询",
},
},
// {
// button: {
// type: "plain",
// name: "新增",
// permission: "pms:blenderStep:save",
// },
// },
];
// const dialogConfigs = {
// extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
// menu: [
// { name: "烧制工艺", key: "info" },
// { name: "工艺参数", key: "attr", onlyEditMode: true },
// ],
// form: {
// rows: [
// [
// {
// input: true,
// label: "工艺名称",
// prop: "name",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入烧制工艺名称" },
// },
// {
// input: true,
// label: "工艺编码",
// prop: "code",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入烧制工艺编码" },
// },
// {
// select: true,
// label: "配方",
// prop: "bomId",
// options: [],
// refreshOptionsAfterConfirm: true,
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { clearable: true, filterable: true, placeholder: "请选择配方" },
// fetchData: (techId = -1) => this.$http.get("/pms/bom/listUnR", { params: { wsId: 3, externalCode: '', key: '', techId } }),
// },
// ],
// // [
// // {
// // forceDisabled: true,
// // prop: 'bomCode',
// // label: '当前配方'
// // },
// // ],
// [{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
// ],
// operations: [
// { name: "add", label: "保存", type: "primary", permission: "pms:firingStep:save", showOnEdit: false },
// { name: "update", label: "更新", type: "primary", permission: "pms:firingStep:update", showOnEdit: true },
// { name: "reset", label: "重置", type: "warning", showAlways: true },
// // { name: 'cancel', label: '取消', showAlways: true },
// ],
// },
// table: {
// extraParams: ["techId", "key"],
// props: [
// // { type: 'index', label: '序号' },
// // { prop: "createTime", label: "添加时间", filter: timeFilter },
// { prop: "name", label: "参数名称", isEditField: true },
// { prop: "code", label: "参数编码", isEditField: true },
// // { prop: "specifications", label: "规格", isEditField: true },
// { prop: "value", label: "参数值", isEditField: true },
// { prop: "valueFloor", label: "参数值下限", isEditField: true },
// { prop: "valueTop", label: "参数值上限", isEditField: true },
// { prop: "description", label: "描述", isEditField: true },
// {
// prop: "operations",
// name: "操作",
// fixed: "right",
// width: 120,
// subcomponent: TableOperaionComponent,
// options: [
// { name: "edit", permission: "pms:blenderStepParam:update" },
// { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" },
// ],
// },
// ],
// data: [
// // TOOD 暂时用不到,但获取可以考虑把拉取接口数据的函数迁移到此文件(没有太大必要)
// ],
// },
// subDialog: {
// extraParam: "techId",
// rows: [
// [
// {
// input: true,
// label: "参数名称",
// prop: "name",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入参数名称" },
// },
// {
// input: true,
// label: "参数编码",
// prop: "code",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入参数编码" },
// },
// ],
// [
// { input: true, label: "参数值上限", prop: "valueTop", elparams: { placeholder: "请输入参数值上限" } },
// { input: true, label: "参数值下限", prop: "valueFloor", elparams: { placeholder: "请输入参数值下限" } },
// ],
// [
// { input: true, label: "参数值", prop: "value", elparams: { placeholder: "请输入参数值" } },
// {
// input: true,
// label: "描述",
// prop: "description",
// // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入描述" },
// },
// ],
// ],
// operations: [
// { name: "add", label: "保存", type: "primary", showOnEdit: false },
// { name: "update", label: "更新", type: "primary", showOnEdit: true },
// // { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
// // { name: 'reset', label: '重置', type: 'warning', showAlways: true },
// // { name: 'cancel', label: '取消', showAlways: true },
// ],
// },
// };
return {
// dialogConfigs,
tableConfig: {
table: null, // 此处可省略el-table 上的配置项
column: tableProps, // el-column-item 上的配置项
},
headFormConfigs: {
rules: null, // 名称是由 BaseSearchForm.vue 组件固定的
fields: headFormFields, // 名称是由 BaseSearchForm.vue 组件固定的
},
urls: {
// base: "/pms/equipmentTech",
page: "/pms/qualityPackOrder/pageView",
pageIsPostApi: true, // 使用post接口来获取page数据极少用目前基本上只有工艺管理模块里在用
// subase: "/pms/equipmentTechParam",
// subpage: "/pms/equipmentTechParam/page",
// copyUrl: "/pms/equipmentTech/copy",
// more...
},
};
}

View File

@ -0,0 +1,51 @@
<template>
<ListViewWithHead
:table-config="tableConfig"
:head-config="headFormConfigs"
:dialog-configs="dialogConfigs"
:list-query-extra="[]"
/>
</template>
<script>
import initConfig from "./config";
import ListViewWithHead from "@/views/atomViews/ListViewWithHead.vue";
export default {
name: "BlenderView",
components: { ListViewWithHead },
provide() {
return {
urls: this.allUrls,
};
},
// urls: {
// type: Object,
// required: true,
// default: () => ({
// /** url **/ list: null,
// /** url **/ page: null,
// /** url **/ edit: null,
// /** url **/ delete: null,
// /** url **/ detail: null,
// /** url **/ export: null,
// /** url **/ import: null,
// /** url **/ other: null,
// }),
// },
data() {
const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
return {
tableConfig,
headFormConfigs,
allUrls: urls,
dialogConfigs,
};
},
created() {},
mounted() {},
methods: {},
};
</script>
<style scoped></style>