mt-fe-group/pms-aomei
8
0
Fork 0
程式碼 問題 合併請求 版本發布 Wiki 動態

update

瀏覽代碼
This commit is contained in:
lb 2023-03-10 15:59:56 +08:00
父節點 c4b8a642ea
當前提交 8e5f668a41
共有 2 個檔案被更改，包括 106 行新增 和 94 行删除
顯示統計資料 下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

196
src/views/modules/pms/order/config.js
查看文件

@ -23,8 +23,8 @@ function changeOrderSort(orderId, location) {
export default function () {
const operations = {
ongoing: [
// { name: 'view-detail', label: '查看详情' },
// { name: 'confirm-order', label: '确认', icon: 'success', showText: true },
{ name: 'view', label: '查看详情' },
{ name: "end-order", label: "结束", icon: "error", showText: true },
{ name: "move-up", label: "上移", icon: "caret-top", showText: true },
{ name: "move-down", label: "下移", icon: "caret-bottom", showText: true },
@ -34,6 +34,7 @@ export default function () {
],
pending: [
"edit",
{ name: 'view', label: '查看详情' },
{ name: "confirm-order", label: "确认订单", icon: "success", showText: true },
{ name: "move-up", label: "上移", icon: "caret-top", showText: true },
{ name: "move-down", label: "下移", icon: "caret-bottom", showText: true },
@ -42,6 +43,8 @@ export default function () {
{ name: "delete", emitFull: true, permission: "" },
],
finished: [
{ name: 'view', label: '查看详情' },
{} // 占位
// { name: 'view', label: '查看详情' }
// { name: 'end-order', label: '结束订单', icon: 'error', showText: true },
],
@ -75,102 +78,111 @@ export default function () {
{ width: 120, prop: "deliveryTime", label: "发货时间" },
{ width: 120, prop: "customerCode", label: "客户" },
{ width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" },
{ prop: "description", label: "详情", subcomponent: TableTextComponent },
// { prop: "description", label: "详情", subcomponent: TableTextComponent },
{ width: 200, prop: "remark", label: "备注" },
type !== "finished"
? {
prop: "operations",
name: "操作",
fixed: "right",
subcomponent: TableOperaionComponent,
options: operations[type],
width: operations[type].length * 64,
}
: {},
{
prop: "operations",
name: "操作",
fixed: "right",
subcomponent: TableOperaionComponent,
options: operations[type],
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) =>
({
ongoing: [
{
label: "订单号",
prop: "code",
input: true,
default: { value: "" },
bind: { placeholder: "请输入订单号" },
({
ongoing: [
{
label: "订单号",
prop: "code",
input: true,
default: { value: "" },
bind: { placeholder: "请输入订单号" },
},
{
// 时间段
timerange: true,
prop: "timerange",
label: "时间段",
bind: {
placeholder: "选择日期时间",
type: "datetimerange",
"start-placeholder": "开始时间",
"end-placeholder": "结束时间",
},
{
// 时间段
timerange: true,
prop: "timerange",
label: "时间段",
bind: {
placeholder: "选择日期时间",
type: "datetimerange",
"start-placeholder": "开始时间",
"end-placeholder": "结束时间",
},
},
{
// 查询
button: {
type: "primary",
name: "查询",
},
{
// 查询
button: {
type: "primary",
name: "查询",
},
},
],
pending: [
{
label: "订单号",
prop: "code",
input: true,
bind: { placeholder: "请输入订单号" },
},
{
// 查询
button: {
type: "primary",
name: "查询",
},
],
pending: [
{
label: "订单号",
prop: "code",
input: true,
bind: { placeholder: "请输入订单号" },
},
{
// 新增订单
button: {
type: "primary",
name: "新增",
permission: "",
},
{
// 查询
button: {
type: "primary",
name: "查询",
},
bind: {
plain: true,
},
{
// 新增订单
button: {
type: "primary",
name: "新增",
permission: "",
},
bind: {
plain: true,
},
},
{
// 导入订单 - TODO: 需完善具体接口和功能
button: {
type: "success",
name: "导入订单",
},
{
// 导入订单 - TODO: 需完善具体接口和功能
button: {
type: "success",
name: "导入订单",
},
bind: {
plain: true,
},
bind: {
plain: true,
},
],
finished: [
{
label: "订单号",
prop: "code",
input: true,
bind: { placeholder: "请输入订单号" },
},
],
finished: [
{
label: "订单号",
prop: "code",
input: true,
bind: { placeholder: "请输入订单号" },
},
{
// 查询
button: {
type: "primary",
name: "查询",
},
{
// 查询
button: {
type: "primary",
name: "查询",
},
},
],
}[type]);
},
],
}[type]);
const textOnlyComponent = {
props: {
@ -294,7 +306,7 @@ export default function () {
{
input: true,
label: "Add on",
prop: "addon",
prop: "sapParam1",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入addon" },
},
@ -325,15 +337,15 @@ export default function () {
{
select: true,
label: "牌号",
prop: "brand",
prop: "bomId",
options: [],
// optionLabel: '',
fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "", externalCode: "" } }),
elparams: { placeholder: "请选择牌号", filterable: true },
// TODO: 选择后，需要带出一些数据
injectTo: [
[ 'bomCode', 'code' ],
[ 'ai', 'externalCode' ]
['bomCode', 'code'],
['ai', 'externalCode']
]
},
{
@ -381,7 +393,7 @@ export default function () {
{
input: true,
label: "烧成温度 ℃",
prop: "ktmp",
prop: "sapParam6",
rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" },
{ type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
@ -389,7 +401,7 @@ export default function () {
elparams: { placeholder: "请输入烧成温度" },
},
// {
// input: true,
// input: true,
// label: "版本号",
// prop: "ai",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
@ -400,7 +412,7 @@ export default function () {
{
input: true,
label: "烧成时间 H",
prop: "tt",
prop: "sapParam7",
rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" },
{ type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },

4
src/views/modules/pms/order/index.vue
查看文件

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