mt-fe-group/pms-aomei
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update docs_0810

Browse Source
This commit is contained in:
lb
2023-08-10 15:46:24 +08:00
parent e3346be048
commit 09c6a609b8
14 changed files with 291 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/modules/pms/carHistory/config.js
View File

@@ -1,6 +1,6 @@
import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
import StateSelect from "@/components/StateSelect.vue";
import request from "@/utils/request";
// import StateSelect from "@/components/StateSelect.vue";
// import request from "@/utils/request";
import { timeFilter } from "@/utils/filters";
export default function () {
@@ -8,7 +8,7 @@ export default function () {
// { type: 'index', label: '序号' },
// { prop: "createTime", label: "添加时间", filter: timeFilter },
{ prop: "code", label: "窑车号" },
{ prop: "stateDictValue", label: "状态", subcomponent: StateSelect },
// { prop: "stateDictValue", label: "状态", subcomponent: StateSelect },
// { prop: "stateDictValue", label: "状态", filter: v => (v !== null && v !== undefined) ? ['没有数据', '正常', '判废', '过渡'][v] : '-' }, // subcomponent
{ prop: "orderCode", label: "订单号" },
{ prop: "posCode", label: "位置" },

70
src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
View File

@@ -7,7 +7,11 @@
<el-col :span="6">
<el-form-item label="订单状态" prop="statusDictValue" :rules="null">
<span style="display: block; margin-top: 32px">
{{ ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][dataForm.statusDictValue] }}
{{
["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][
dataForm.statusDictValue
]
}}
</span>
</el-form-item>
</el-col>
@@ -160,7 +164,9 @@
:label="opt.label"
:value="opt.value"
style="display: flex; align-items: center">
<span style="display: inline-block; width: 128px; text-overflow: ellipsis">{{ opt.label }}</span>
<span style="display: inline-block; width: 128px; text-overflow: ellipsis">
{{ opt.label }}
</span>
<span
v-if="requestList[3].extraLabel"
style="display: inline-block; margin-left: 12px; font-size: 0.9em">
@@ -375,9 +381,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item
label="销售订单号"
prop="saleNo">
<el-form-item label="销售订单号" prop="saleNo">
<!-- :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }"> -->
<el-input
v-model="dataForm.saleNo"
@@ -413,9 +417,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="销售时间"
prop="deliveryTime">
<el-form-item label="销售时间" prop="deliveryTime">
<!-- :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }"> -->
<el-date-picker
v-model="dataForm.deliveryTime"
@@ -456,8 +458,54 @@
<span style="display: block; margin-top: 32px">{{ dataForm.shortDesc }}</span>
</el-form-item>
</el-col>
<el-col :span="6"></el-col>
<el-col :span="6"></el-col>
<el-col :span="6">
<el-form-item
label="托盘类型"
prop="palletType"
:rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
<el-select
v-model="dataForm.palletType"
filterable
clearable
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '选择托盘类型' }">
<el-option
v-for="opt in [
{ label: '非熏蒸', value: '0' },
{ label: '熏蒸', value: '1' },
]"
:key="opt.label"
:label="opt.label"
:value="opt.value">
<span>{{ opt.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="贴纸板"
prop="paperboard"
:rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
<el-select
v-model="dataForm.paperboard"
filterable
clearable
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '选择贴纸板' }">
<el-option
v-for="opt in [
{ label: '不要', value: '0' },
{ label: '要', value: '1' },
]"
:key="opt.label"
:label="opt.label"
:value="opt.value">
<span>{{ opt.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col>
@@ -526,6 +574,8 @@ export default {
customerId: null,
shortDesc: null,
remark: null,
palletType: null,
paperboard: null,
},
requestList: [
{

6
src/views/modules/pms/finishedOrder/config.js
View File

@@ -8,8 +8,8 @@ import { getDictDataList } from '@/utils';
export default function () {
const tableProps = [
{ width: 60, type: "index", label: "序号", fixed: true },
{ width: 120, prop: "code", label: "订单号", fixed: "left" },
{ width: 60, type: "index", label: "序号", fixed: true },
{ width: 60, prop: "cate", label: "子号" },
{ width: 100, prop: "productCode", label: "物料" },
{ width: 100, prop: "shapeCode", label: "砖型" },
@@ -23,7 +23,7 @@ export default function () {
{ width: 120, prop: "planStartTime", label: "计划开始时间", filter: timeFilter },
{ width: 120, prop: "startTime", label: "开始时间", filter: timeFilter },
{ width: 120, prop: "sapParam6", label: "烧成温度" },
{ width: 120, prop: "sapParam7", label: "烧成时间(h)" },
{ width: 120, prop: "sapParam7", label: "烧成时间(min)" },
{ width: 200, prop: "packTechCode", label: "包装工艺代码" },
{ width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" },
{ width: 120, prop: "customerCode", label: "客户" },
@@ -495,7 +495,7 @@ export default function () {
},
{
input: true,
label: "烧成时间 H",
label: "烧成时间(min)",
prop: "sapParam7",
rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" },

41
src/views/modules/pms/firingStep/config.js
View File

@@ -88,29 +88,6 @@ export default function () {
form: {
rows: [
[
// {
// input: true,
// label: "工艺名称",
// prop: "name",
// 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, version: '', key: '', techId } }),
// cacheFetchedData: true,
// changeReflects: {
// fromKey: ['code', 'version'],
// delimiter: '-',
// toProp: 'code'
// }
// },
{
input: true,
autoDisabled: true,
@@ -120,13 +97,6 @@ export default function () {
elparams: { placeholder: "请输入烧成曲线编码" },
},
],
// [
// {
// forceDisabled: true,
// prop: 'bomCode',
// label: '当前配方'
// },
// ],
[{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
],
operations: [
@@ -139,14 +109,9 @@ export default function () {
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 },
{ width: 80, prop: "value", label: "参数值", isEditField: true },
// { prop: "valueFloor", label: "参数值下限", isEditField: true },
// { prop: "valueTop", label: "参数值上限", isEditField: true },
{ prop: "description", label: "描述", isEditField: true },
{
prop: "operations",
@@ -155,7 +120,7 @@ export default function () {
width: 90,
subcomponent: TableOperaionComponent,
options: [
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:equipmentTechParam:update" },
// { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
],
},
@@ -200,8 +165,8 @@ export default function () {
],
],
operations: [
{ name: "add", label: "保存", type: "primary", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", showOnEdit: true },
{ name: "add", label: "保存", type: "primary", showOnEdit: false, permission: 'pms:equipmentTechParam:save' },
{ name: "update", label: "更新", type: "primary", showOnEdit: true, permission: 'pms:equipmentTechParam:update' },
// { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
// { name: 'reset', label: '重置', type: 'warning', showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },

8
src/views/modules/pms/materialStorageDynamic/config.js
View File

@@ -12,14 +12,14 @@ export default function () {
{ width: 90, prop: "typeDictValue", label: "料仓类型", filter: dictFilter("liaocang") },
// { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
{ width: 220, prop: "materialDescription", label: "原料" },
{ width: 128, prop: "materialName", label: "中文描述" },
{ prop: "qty", label: "料位[kg]" },
// { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
{ width: 128, prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter("material_category") },
{ width: 128, prop: "density", label: "原料堆积密度" },
{ width: 90, prop: "dosLow", label: "加料下限" },
{ width: 90, prop: "dosHigh", label: "加料上限" },
// { width: 128, prop: "density", label: "原料堆积密度" },
// { width: 90, prop: "dosLow", label: "加料下限" },
// { width: 90, prop: "dosHigh", label: "加料上限" },
{ width: 128, prop: "description", label: "描述" },
{ width: 128, prop: "materialName", label: "中文描述" },
// { prop: "remark", label: "备注" },
{ width: 128, prop: "createTime", label: "添加时间", filter: timeFilter },
{

72
src/views/modules/pms/order/components/tabs/orderDetail.vue
View File

@@ -7,7 +7,11 @@
<el-col :span="6">
<el-form-item label="订单状态" prop="statusDictValue" :rules="null">
<span style="display: block; margin-top: 32px">
{{ ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][dataForm.statusDictValue] }}
{{
["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][
dataForm.statusDictValue
]
}}
</span>
</el-form-item>
</el-col>
@@ -160,7 +164,9 @@
:label="opt.label"
:value="opt.value"
style="display: flex; align-items: center">
<span style="display: inline-block; width: 128px; text-overflow: ellipsis">{{ opt.label }}</span>
<span style="display: inline-block; width: 128px; text-overflow: ellipsis">
{{ opt.label }}
</span>
<span
v-if="requestList[3].extraLabel"
style="display: inline-block; margin-left: 12px; font-size: 0.9em">
@@ -266,7 +272,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
<!-- <el-form-item
label="烧成温度"
prop="sapParam6"
:rules="[
@@ -282,11 +288,11 @@
v-model="dataForm.sapParam6"
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '输入烧成温度' }"></el-input>
</el-form-item>
</el-form-item> -->
</el-col>
<el-col :span="6">
<el-form-item
label="烧成时间 H"
<!-- <el-form-item
label="烧成时间(min)"
prop="sapParam7"
:rules="[
{ required: true, message: '必填项不能为空', trigger: 'blur' },
@@ -301,7 +307,7 @@
v-model="dataForm.sapParam7"
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '输入烧成时间' }"></el-input>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
</InputsArea>
@@ -456,8 +462,54 @@
<span style="display: block; margin-top: 32px">{{ dataForm.shortDesc }}</span>
</el-form-item>
</el-col>
<el-col :span="6"></el-col>
<el-col :span="6"></el-col>
<el-col :span="6">
<el-form-item
label="托盘类型"
prop="palletType"
:rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
<el-select
v-model="dataForm.palletType"
filterable
clearable
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '选择托盘类型' }">
<el-option
v-for="opt in [
{ label: '非熏蒸', value: '0' },
{ label: '熏蒸', value: '1' },
]"
:key="opt.label"
:label="opt.label"
:value="opt.value">
<span>{{ opt.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="贴纸板"
prop="paperboard"
:rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
<el-select
v-model="dataForm.paperboard"
filterable
clearable
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '选择贴纸板' }">
<el-option
v-for="opt in [
{ label: '不要', value: '0' },
{ label: '要', value: '1' },
]"
:key="opt.label"
:label="opt.label"
:value="opt.value">
<span>{{ opt.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col>
@@ -526,6 +578,8 @@ export default {
customerId: null,
shortDesc: null,
remark: null,
palletType: null,
paperboard: null
},
requestList: [
{

4
src/views/modules/pms/order/config.js
View File

@@ -76,7 +76,7 @@ export default function () {
{ width: 120, prop: "planStartTime", label: "计划开始时间", filter: timeFilter }, // "订单砖数" },
...startTimeProp(type),
{ width: 120, prop: "sapParam6", label: "烧成温度" },
{ width: 120, prop: "sapParam7", label: "烧成时间(h)" },
{ width: 120, prop: "sapParam7", label: "烧成时间(min)" },
{ width: 200, prop: "packTechCode", label: "包装工艺代码" }, // select, filterable
{ width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" },
{ width: 120, prop: "customerCode", label: "客户" },
@@ -431,7 +431,7 @@ export default function () {
},
{
input: true,
label: "烧成时间 H",
label: "烧成时间(min)",
prop: "sapParam7",
rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" },

2
src/views/modules/pms/order/index.vue
View File

@@ -90,7 +90,7 @@ export default {
cellClassName({ row, column, rowIndex, columnIndex }) {
if ("statusDictValue" in row && row.statusDictValue == "2") {
console.log("setting cell style.....", row);
// console.log("setting cell style.....", row);
return "cell-in-production";
}
},

97
src/views/modules/pms/packingStep/config.js
View File

@@ -8,7 +8,11 @@ export default function () {
{ type: "index", label: "序号" },
// { prop: "name", label: "工艺名称" },
{ prop: "code", label: "工艺编码" },
// { prop: 'version', label: '配方号' },
{
prop: "externalCode",
label: "托盘类型",
filter: (val) => (val?.toString() == "0" || val?.toString() == 1 ? ["非熏蒸", "熏蒸"][val] : ""),
},
// { prop: "shapeCode", label: "砖型" },
// { prop: 'status', label: '状态', subcomponent: StatusComponent }, // subcomponent
// { prop: "description", label: "详情", subcomponent: TableTextComponent },
@@ -24,7 +28,13 @@ export default function () {
options: [
// { name: "copy", label: "复制", icon: "copy-document" },
{ name: "edit", label: "编辑", icon: "edit-outline" },
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:packingStep:delete" },
{
name: "delete",
icon: "delete",
label: "删除",
emitFull: true,
permission: "pms:packingStep:delete",
},
],
},
];
@@ -82,13 +92,6 @@ export default function () {
form: {
rows: [
[
// {
// input: true,
// label: "工艺名称",
// prop: "name",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入工艺名称" },
// },
{
input: true,
label: "工艺编码",
@@ -97,16 +100,23 @@ export default function () {
elparams: { placeholder: "请输入工艺编码" },
},
// {
// select: true,
// label: "砖型",
// prop: "shapeId",
// options: [],
// refreshOptionsAfterConfirm: true,
// input: true,
// label: "托盘类型",
// prop: "name",
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { clearable: true, filterable: true, placeholder: "请选择砖型" },
// // 下面参数的 techId 是为 /pms/xxx/listUnR 接口定制的，默认为 -1，新增时使用，编辑时传对应的 工艺id
// fetchData: (techId = -1) => this.$http.get("/pms/shape/listUnR", { params: { wsId: 5, externalCode: '', key: '', techId } }),
// elparams: { placeholder: "请输入工艺名称" },
// },
{
select: true,
label: "托盘类型",
prop: "externalCode",
options: [
{ value: "0", label: "非熏蒸" },
{ value: "1", label: "熏蒸" },
],
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { clearable: true, filterable: true, placeholder: "请选择托盘类型" },
},
],
// [
// {
@@ -126,8 +136,20 @@ export default function () {
[{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:packingStep:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:packingStep:update", showOnEdit: true },
{
name: "add",
label: "保存",
type: "primary",
permission: "pms:packingStep:save",
showOnEdit: false,
},
{
name: "update",
label: "更新",
type: "primary",
permission: "pms:packingStep:update",
showOnEdit: true,
},
{ name: "reset", label: "重置", type: "warning", showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],
@@ -151,7 +173,12 @@ export default function () {
width: 120,
subcomponent: TableOperaionComponent,
options: [
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
{
name: "edit",
label: "编辑",
icon: "edit-outline",
permission: "pms:blenderStepParam:update",
},
// { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
],
},
@@ -181,8 +208,18 @@ export default function () {
},
],
[
{ input: true, label: "参数值上限", prop: "valueTop", elparams: { placeholder: "请输入参数值上限" } },
{ input: true, label: "参数值下限", prop: "valueFloor", elparams: { placeholder: "请输入参数值下限" } },
{
input: true,
label: "参数值上限",
prop: "valueTop",
elparams: { placeholder: "请输入参数值上限" },
},
{
input: true,
label: "参数值下限",
prop: "valueFloor",
elparams: { placeholder: "请输入参数值下限" },
},
],
[
{ input: true, label: "参数值", prop: "value", elparams: { placeholder: "请输入参数值" } },
@@ -196,8 +233,20 @@ export default function () {
],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:blenderStepParam:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
{
name: "add",
label: "保存",
type: "primary",
permission: "pms:blenderStepParam:save",
showOnEdit: false,
},
{
name: "update",
label: "更新",
type: "primary",
permission: "pms:blenderStepParam:update",
showOnEdit: true,
},
// { name: 'reset', label: '重置', type: 'warning', showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],

26
src/views/modules/pms/shape/config.js
View File

@@ -116,10 +116,24 @@ export default function () {
input: true,
label: "砖型ID",
prop: "externalCode",
rules: [{ type: "number", trigger: "blur", message: "请输入数字类型", transform: (val) => Number(val) }],
rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" },
{
type: "number",
trigger: "blur",
message: "请输入数字类型",
transform: (val) => Number(val),
},
],
elparams: { placeholder: "外部编码" },
},
{ input: true, label: "短描述", prop: "shortDesc", elparams: { placeholder: "短描述" } },
{
input: true,
label: "喷码描述",
prop: "shortDesc",
rules: [{ required: true, message: "必填项不能为空", trigger: "blur" }],
elparams: { placeholder: "喷码描述" },
},
],
[
{
@@ -142,7 +156,13 @@ export default function () {
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:shape:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:shape:update", showOnEdit: true },
{
name: "update",
label: "更新",
type: "primary",
permission: "pms:shape:update",
showOnEdit: true,
},
{ name: "reset", label: "重置", type: "warning", showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],

6
src/views/modules/pms/shapeStep/config.js
View File

@@ -153,7 +153,7 @@ export default function () {
width: 90,
subcomponent: TableOperaionComponent,
options: [
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:equipmentTechParam:update" },
// { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
],
},
@@ -198,8 +198,8 @@ export default function () {
],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:blenderStepParam:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
{ name: "add", label: "保存", type: "primary", permission: "pms:equipmentTechParam:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:equipmentTechParam:update", showOnEdit: true },
// { name: 'reset', label: '重置', type: 'warning', showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],

6
src/views/modules/pms/testingStep/config.js
View File

@@ -155,7 +155,7 @@ export default function () {
width: 90,
subcomponent: TableOperaionComponent,
options: [
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:equipmentTechParam:update" },
// { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
],
},
@@ -200,8 +200,8 @@ export default function () {
],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:blenderStepParam:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
{ name: "add", label: "保存", type: "primary", permission: "pms:equipmentTechParam:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:equipmentTechParam:update", showOnEdit: true },
// { name: 'reset', label: '重置', type: 'warning', showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],