This commit is contained in:
lb 2023-03-10 15:59:56 +08:00
parent c4b8a642ea
commit 8e5f668a41
2 changed files with 106 additions and 94 deletions

View File

@ -23,8 +23,8 @@ function changeOrderSort(orderId, location) {
export default function () { export default function () {
const operations = { const operations = {
ongoing: [ ongoing: [
// { name: 'view-detail', label: '查看详情' },
// { name: 'confirm-order', label: '确认', icon: 'success', showText: true }, // { name: 'confirm-order', label: '确认', icon: 'success', showText: true },
{ name: 'view', label: '查看详情' },
{ name: "end-order", label: "结束", icon: "error", showText: true }, { name: "end-order", label: "结束", icon: "error", showText: true },
{ name: "move-up", label: "上移", icon: "caret-top", showText: true }, { name: "move-up", label: "上移", icon: "caret-top", showText: true },
{ name: "move-down", label: "下移", icon: "caret-bottom", showText: true }, { name: "move-down", label: "下移", icon: "caret-bottom", showText: true },
@ -34,6 +34,7 @@ export default function () {
], ],
pending: [ pending: [
"edit", "edit",
{ name: 'view', label: '查看详情' },
{ name: "confirm-order", label: "确认订单", icon: "success", showText: true }, { name: "confirm-order", label: "确认订单", icon: "success", showText: true },
{ name: "move-up", label: "上移", icon: "caret-top", showText: true }, { name: "move-up", label: "上移", icon: "caret-top", showText: true },
{ name: "move-down", label: "下移", icon: "caret-bottom", showText: true }, { name: "move-down", label: "下移", icon: "caret-bottom", showText: true },
@ -42,6 +43,8 @@ export default function () {
{ name: "delete", emitFull: true, permission: "" }, { name: "delete", emitFull: true, permission: "" },
], ],
finished: [ finished: [
{ name: 'view', label: '查看详情' },
{} // 占位
// { name: 'view', label: '查看详情' } // { name: 'view', label: '查看详情' }
// { name: 'end-order', label: '结束订单', icon: 'error', showText: true }, // { name: 'end-order', label: '结束订单', icon: 'error', showText: true },
], ],
@ -75,10 +78,9 @@ export default function () {
{ width: 120, prop: "deliveryTime", label: "发货时间" }, { width: 120, prop: "deliveryTime", label: "发货时间" },
{ width: 120, prop: "customerCode", label: "客户" }, { width: 120, prop: "customerCode", label: "客户" },
{ width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" }, { width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" },
{ prop: "description", label: "详情", subcomponent: TableTextComponent }, // { prop: "description", label: "详情", subcomponent: TableTextComponent },
{ width: 200, prop: "remark", label: "备注" }, { width: 200, prop: "remark", label: "备注" },
type !== "finished" {
? {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
@ -86,7 +88,17 @@ export default function () {
options: operations[type], options: operations[type],
width: operations[type].length * 64, width: operations[type].length * 64,
} }
: {},
// type !== "finished"
// ? {
// prop: "operations",
// name: "操作",
// fixed: "right",
// subcomponent: TableOperaionComponent,
// options: operations[type],
// width: operations[type].length * 64,
// }
// : {},
]; ];
const genHeadFormFields = (type) => const genHeadFormFields = (type) =>
@ -294,7 +306,7 @@ export default function () {
{ {
input: true, input: true,
label: "Add on", label: "Add on",
prop: "addon", prop: "sapParam1",
rules: { required: true, message: "必填项不能为空", trigger: "blur" }, rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入addon" }, elparams: { placeholder: "请输入addon" },
}, },
@ -325,7 +337,7 @@ export default function () {
{ {
select: true, select: true,
label: "牌号", label: "牌号",
prop: "brand", prop: "bomId",
options: [], options: [],
// optionLabel: '', // optionLabel: '',
fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "", externalCode: "" } }), fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "", externalCode: "" } }),
@ -381,7 +393,7 @@ export default function () {
{ {
input: true, input: true,
label: "烧成温度 ℃", label: "烧成温度 ℃",
prop: "ktmp", prop: "sapParam6",
rules: [ rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" }, { required: true, message: "必填项不能为空", trigger: "blur" },
{ type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
@ -400,7 +412,7 @@ export default function () {
{ {
input: true, input: true,
label: "烧成时间 H", label: "烧成时间 H",
prop: "tt", prop: "sapParam7",
rules: [ rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" }, { required: true, message: "必填项不能为空", trigger: "blur" },
{ type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },

View File

@ -147,7 +147,7 @@ export default {
.inner-sidebar { .inner-sidebar {
position: fixed; position: fixed;
width: 240px; width: 128px;
margin-right: 16px; margin-right: 16px;
padding: 8px 0; padding: 8px 0;
/* min-height: inherit; */ /* min-height: inherit; */
@ -181,7 +181,7 @@ export default {
.list-view-with-head-list { .list-view-with-head-list {
width: 1px; width: 1px;
margin-left: 256px; margin-left: 144px;
flex-grow: 1; flex-grow: 1;
} }
</style> </style>