update 上料模块里的单位展示
This commit is contained in:
parent
5b871f27f5
commit
59034e7caa
@ -50,7 +50,7 @@ import BaseListTable from "@/components/BaseListTable.vue";
|
||||
import BaseSearchForm from "@/components/BaseSearchForm.vue";
|
||||
import DialogWithMenu from "@/components/DialogWithMenu.vue";
|
||||
import DialogJustForm from "@/components/DialogJustForm.vue";
|
||||
import moment from 'moment'
|
||||
import moment from "moment";
|
||||
|
||||
const DIALOG_WITH_MENU = "DialogWithMenu";
|
||||
const DIALOG_JUST_FORM = "DialogJustForm";
|
||||
@ -62,8 +62,8 @@ export default {
|
||||
tableConfig: {
|
||||
type: Object,
|
||||
default: () => ({
|
||||
/** 列配置, 即 props **/ columnConfig: [],
|
||||
/** 表格整体配置 */ tableConfig: undefined,
|
||||
/** 列配置, 即 props **/ column: [],
|
||||
/** 表格整体配置 */ table: undefined,
|
||||
}),
|
||||
},
|
||||
headConfig: {
|
||||
@ -151,14 +151,14 @@ export default {
|
||||
if (res.code === 0) {
|
||||
// page 场景:
|
||||
if ("list" in res.data) {
|
||||
// real env:
|
||||
this.dataList = res.data.list.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
id: item._id ?? item.id,
|
||||
};
|
||||
// }
|
||||
});
|
||||
/** 破碎记录的特殊需求:数据要结合单位 material + materialUnitDictValue */
|
||||
if ("attachDictValue" in this.tableConfig.column) {
|
||||
this.dataList = res.data.list.map((row) => {
|
||||
this.tableConfig.column.attachDictValue(row, "unit", "qty", "materialUnitDictValue");
|
||||
return row;
|
||||
});
|
||||
} else this.dataList = res.data.list;
|
||||
|
||||
this.totalPage = res.data.total;
|
||||
} else if ("records" in res.data) {
|
||||
this.dataList = res.data.records.map((item) => ({
|
||||
@ -185,7 +185,7 @@ export default {
|
||||
type: "error",
|
||||
duration: 2000,
|
||||
});
|
||||
this.tableLoading = false
|
||||
this.tableLoading = false;
|
||||
});
|
||||
// }
|
||||
},
|
||||
@ -311,16 +311,16 @@ export default {
|
||||
break;
|
||||
case "查询": {
|
||||
const params = {};
|
||||
|
||||
|
||||
/** 处理 payload 里的数据 */
|
||||
if (typeof payload === 'object') {
|
||||
if (typeof payload === "object") {
|
||||
// BaseSearchForm 给这个组件传递了数据
|
||||
Object.assign(params, payload)
|
||||
if ('timerange' in params && !!params.timerange) {
|
||||
const [startTime, endTime] = params['timerange']
|
||||
delete params.timerange
|
||||
params.startTime = moment(startTime).format('YYYY-MM-DD HH:mm:ss')
|
||||
params.endTime = moment(endTime).format('YYYY-MM-DD HH:mm:ss')
|
||||
Object.assign(params, payload);
|
||||
if ("timerange" in params && !!params.timerange) {
|
||||
const [startTime, endTime] = params["timerange"];
|
||||
delete params.timerange;
|
||||
params.startTime = moment(startTime).format("YYYY-MM-DD HH:mm:ss");
|
||||
params.endTime = moment(endTime).format("YYYY-MM-DD HH:mm:ss");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -90,16 +90,9 @@ export default function () {
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入混料程序编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
forceDisabled: true,
|
||||
prop: 'bomCode',
|
||||
label: '当前配方'
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: "选择新配方",
|
||||
label: "配方",
|
||||
prop: "bomId",
|
||||
options: [],
|
||||
refreshOptionsAfterConfirm: true,
|
||||
@ -107,6 +100,13 @@ export default function () {
|
||||
fetchData: (techId = -1) => this.$http.get("/pms/bom/listUnR", { params: { wsId: 1, externalCode: '', key: '', techId } }),
|
||||
},
|
||||
],
|
||||
// [
|
||||
// {
|
||||
// forceDisabled: true,
|
||||
// prop: 'bomCode',
|
||||
// label: '当前配方'
|
||||
// },
|
||||
// ],
|
||||
[{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
|
||||
],
|
||||
operations: [
|
||||
@ -124,9 +124,9 @@ export default function () {
|
||||
{ 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: "value", label: "参数值", isEditField: true },
|
||||
{ prop: "valueFloor", label: "参数值下限", isEditField: true },
|
||||
{ prop: "valueTop", label: "参数值上限", isEditField: true },
|
||||
{ prop: "description", label: "描述", isEditField: true },
|
||||
{
|
||||
prop: "operations",
|
||||
@ -161,7 +161,7 @@ export default function () {
|
||||
label: "参数编码",
|
||||
prop: "code",
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入描述" },
|
||||
elparams: { placeholder: "请输入参数编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
|
@ -1,13 +1,13 @@
|
||||
import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
|
||||
import switchBtn from "@/components/noTemplateComponents/switchBtn";
|
||||
import request from "@/utils/request";
|
||||
import { timeFilter } from '@/utils/filters'
|
||||
import { timeFilter, dictFilter } from '@/utils/filters'
|
||||
|
||||
export default function () {
|
||||
const tableProps = [
|
||||
{ type: 'index', label: '序号' },
|
||||
// { prop: "createTime", label: "添加时间", filter: timeFilter },
|
||||
{ prop: "updateTime", label: "上料时间", filter: timeFilter },
|
||||
{ prop: "createTime", label: "添加时间", filter: timeFilter },
|
||||
// { prop: "updateTime", label: "上料时间", filter: timeFilter },
|
||||
{ prop: "materialName", label: "原料" },
|
||||
// { prop: "material", label: "原料编码" },
|
||||
{ prop: "qty", label: "上料量" },
|
||||
@ -29,6 +29,32 @@ export default function () {
|
||||
},
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* 数据字典hack
|
||||
* @param {object} row 行数据
|
||||
* @param {string} dictId 从哪个数据字典映射数据
|
||||
* @param {string} dataProp 把字典值附加到哪个 prop 字段上
|
||||
* @param {string} dictProp 哪个prop是字典数据
|
||||
**/
|
||||
let dictList;
|
||||
tableProps.attachDictValue = (row, dictId, dataProp, dictProp, forceFlushDictList = false) => {
|
||||
/** 缓存一下 dictList **/
|
||||
if (!dictList || (dictList && forceFlushDictList)) dictList = dictFilter(dictId)
|
||||
|
||||
if (typeof row === 'object' && dictList) {
|
||||
const value = dictList(row[dictProp])
|
||||
const data = row[dataProp]
|
||||
row[dataProp] = data + ' ' + (value === '-' ? '' : value)
|
||||
} else {
|
||||
this.$message({
|
||||
message: 'tableProps.attachDictValue() 出错!',
|
||||
type: 'error',
|
||||
duration: 1500
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const headFormFields = [
|
||||
{
|
||||
prop: 'material',
|
||||
@ -113,7 +139,7 @@ export default function () {
|
||||
elparams: { placeholder: "请输入上料量" },
|
||||
},
|
||||
{ select: true, label: "破碎作业", prop: "statusDictValue", options: [{ label: '正常停止', value: 0 }, { label: '废除', value: '1' }], elparams: { placeholder: "破碎作业", filterable: true } },
|
||||
|
||||
|
||||
],
|
||||
[
|
||||
{
|
||||
|
@ -90,16 +90,9 @@ export default function () {
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入烧制工艺编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
forceDisabled: true,
|
||||
prop: 'bomCode',
|
||||
label: '当前配方'
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: "选择新配方",
|
||||
label: "配方",
|
||||
prop: "bomId",
|
||||
options: [],
|
||||
refreshOptionsAfterConfirm: true,
|
||||
@ -107,6 +100,13 @@ export default function () {
|
||||
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: [
|
||||
@ -124,9 +124,9 @@ export default function () {
|
||||
{ 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: "value", label: "参数值", isEditField: true },
|
||||
{ prop: "valueFloor", label: "参数值下限", isEditField: true },
|
||||
{ prop: "valueTop", label: "参数值上限", isEditField: true },
|
||||
{ prop: "description", label: "描述", isEditField: true },
|
||||
{
|
||||
prop: "operations",
|
||||
@ -161,7 +161,7 @@ export default function () {
|
||||
label: "参数编码",
|
||||
prop: "code",
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入描述" },
|
||||
elparams: { placeholder: "请输入参数编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
|
@ -17,7 +17,7 @@
|
||||
<div style="display: flex; flex-direction: column; min-width: 128px; justify-content: space-between">
|
||||
<div style="font-size: 1.125em; line-height: 2.5; text-align: right">{{ material }}</div>
|
||||
<div style="font-size: 1.5em; line-height: 1.25; text-align: right; font-weight: bold">
|
||||
{{ qty }} <span style="color: #777; font-weight: normal; font-size: 1rem">存量</span>
|
||||
{{ qty }} <span style="color: #777; font-weight: normal; font-size: 1rem">{{ computedUnit }}</span>
|
||||
</div>
|
||||
|
||||
<div class="btn-group" style="text-align: right">
|
||||
@ -29,6 +29,8 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { dictFilter } from "@/utils/filters";
|
||||
|
||||
export default {
|
||||
name: "StorageBox",
|
||||
props: {
|
||||
@ -52,9 +54,21 @@ export default {
|
||||
type: String,
|
||||
default: "-",
|
||||
},
|
||||
unitValue: {
|
||||
type: String,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {};
|
||||
return {
|
||||
unitList: dictFilter("unit"),
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
computedUnit() {
|
||||
if (!this.unitValue) return '存量'
|
||||
return this.unitList(this.unitValue)+' 存量'
|
||||
},
|
||||
},
|
||||
created() {},
|
||||
mounted() {},
|
||||
|
@ -30,6 +30,7 @@
|
||||
color="#8899ff"
|
||||
:material="st.material ?? '默认物料'"
|
||||
:total="2"
|
||||
:unit-value="st.unitDictValue"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -45,9 +46,9 @@
|
||||
padding-left: 16px;
|
||||
top: 10px;
|
||||
left: -16px;
|
||||
"
|
||||
"
|
||||
>
|
||||
中间仓
|
||||
中间仓
|
||||
</h3>
|
||||
<div class="middle-list" style="padding: 12px 0; display: flex; flex-wrap: wrap">
|
||||
<storage-box
|
||||
@ -58,11 +59,12 @@
|
||||
color="#99aa11"
|
||||
:material="st.material ?? '默认物料'"
|
||||
:total="2"
|
||||
/>
|
||||
:unit-value="st.unitDictValue"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="unknown-storage" v-if="unknownStorage.length">
|
||||
<h3
|
||||
<div class="unknown-storage" v-if="unknownStorage.length">
|
||||
<h3
|
||||
class=""
|
||||
style="
|
||||
position: relative;
|
||||
@ -73,19 +75,20 @@
|
||||
padding-left: 16px;
|
||||
top: 10px;
|
||||
left: -16px;
|
||||
"
|
||||
"
|
||||
>
|
||||
未知仓
|
||||
</h3>
|
||||
<div class="unknown-list" style="padding: 12px 0; display: flex; flex-wrap: wrap">
|
||||
<storage-box
|
||||
v-for="(st, index) in unknownStorage"
|
||||
:key="index"
|
||||
未知仓
|
||||
</h3>
|
||||
<div class="unknown-list" style="padding: 12px 0; display: flex; flex-wrap: wrap">
|
||||
<storage-box
|
||||
v-for="(st, index) in unknownStorage"
|
||||
:key="index"
|
||||
:qty="st.qty ?? 0"
|
||||
color="#3388ff"
|
||||
:storage="st.name"
|
||||
:material="st.material ?? '默认物料'"
|
||||
:total="2"
|
||||
:unit-value="st.unitDictValue"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -2,7 +2,7 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationC
|
||||
import switchBtn from "@/components/noTemplateComponents/switchBtn";
|
||||
import QuillRichInput from "@/components/noTemplateComponents/richInput";
|
||||
import request from "@/utils/request";
|
||||
import { timeFilter } from "@/utils/filters";
|
||||
import { timeFilter, dictFilter } from "@/utils/filters";
|
||||
|
||||
export default function () {
|
||||
const tableProps = [
|
||||
@ -30,6 +30,32 @@ export default function () {
|
||||
},
|
||||
];
|
||||
|
||||
/**
|
||||
* 数据字典hack
|
||||
* @param {object} row 行数据
|
||||
* @param {string} dictId 从哪个数据字典映射数据
|
||||
* @param {string} dataProp 把字典值附加到哪个 prop 字段上
|
||||
* @param {string} dictProp 哪个prop是字典数据
|
||||
**/
|
||||
let dictList;
|
||||
tableProps.attachDictValue = (row, dictId, dataProp, dictProp, forceFlushDictList = false) => {
|
||||
/** 缓存一下 dictList **/
|
||||
if (!dictList || (dictList && forceFlushDictList)) dictList = dictFilter(dictId)
|
||||
|
||||
if (typeof row === 'object' && dictList) {
|
||||
const value = dictList(row[dictProp])
|
||||
const data = row[dataProp]
|
||||
row[dataProp] = data + ' ' + (value === '-' ? '' : value)
|
||||
} else {
|
||||
this.$message({
|
||||
message: 'tableProps.attachDictValue() 出错!',
|
||||
type: 'error',
|
||||
duration: 1500
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const headFormFields = [
|
||||
{
|
||||
prop: "materialId",
|
||||
|
@ -87,16 +87,9 @@ export default function () {
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入工艺编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
forceDisabled: true,
|
||||
prop: 'shapeCode',
|
||||
label: '当前砖型'
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: "选择新砖型",
|
||||
label: "砖型",
|
||||
prop: "shapeId",
|
||||
options: [],
|
||||
refreshOptionsAfterConfirm: true,
|
||||
@ -105,6 +98,13 @@ export default function () {
|
||||
fetchData: (techId = -1) => this.$http.get("/pms/shape/listUnR", { params: { wsId: 5, externalCode: '', key: '', techId } }),
|
||||
},
|
||||
],
|
||||
// [
|
||||
// {
|
||||
// forceDisabled: true,
|
||||
// prop: 'shapeCode',
|
||||
// label: '当前砖型'
|
||||
// },
|
||||
// ],
|
||||
// {
|
||||
// select: true,
|
||||
// label: "砖型",
|
||||
@ -129,11 +129,11 @@ export default function () {
|
||||
// { prop: "createTime", label: "添加时间", filter: timeFilter },
|
||||
{ prop: "name", label: "参数名称", isEditField: true },
|
||||
{ prop: "code", label: "参数编码", isEditField: true },
|
||||
{ prop: "specifications", 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: "value", label: "设定值", isEditField: true },
|
||||
{ prop: "valueFloor", label: "值下限", isEditField: true },
|
||||
{ prop: "valueTop", label: "值上限", isEditField: true },
|
||||
{
|
||||
prop: "operations",
|
||||
name: "操作",
|
||||
@ -167,7 +167,7 @@ export default function () {
|
||||
label: "参数编码",
|
||||
prop: "code",
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入描述" },
|
||||
elparams: { placeholder: "请输入参数编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
|
@ -87,16 +87,9 @@ export default function () {
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入混料程序编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
forceDisabled: true,
|
||||
prop: 'shapeCode',
|
||||
label: '当前砖型'
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: "选择新砖型",
|
||||
label: "砖型",
|
||||
prop: "shapeId",
|
||||
options: [],
|
||||
refreshOptionsAfterConfirm: true,
|
||||
@ -104,6 +97,13 @@ export default function () {
|
||||
fetchData: (techId = -1) => this.$http.get("/pms/shape/listUnR", { params: { wsId: 2, externalCode: '', key: '', techId } }),
|
||||
},
|
||||
],
|
||||
// [
|
||||
// {
|
||||
// forceDisabled: true,
|
||||
// prop: 'shapeCode',
|
||||
// label: '当前砖型'
|
||||
// },
|
||||
// ],
|
||||
// {
|
||||
// select: true,
|
||||
// label: "砖型",
|
||||
@ -128,11 +128,11 @@ export default function () {
|
||||
// { prop: "createTime", label: "添加时间", filter: timeFilter },
|
||||
{ prop: "name", label: "参数名称", isEditField: true },
|
||||
{ prop: "code", label: "参数编码", isEditField: true },
|
||||
{ prop: "specifications", 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: "value", label: "设定值", isEditField: true },
|
||||
{ prop: "valueFloor", label: "值下限", isEditField: true },
|
||||
{ prop: "valueTop", label: "值上限", isEditField: true },
|
||||
{
|
||||
prop: "operations",
|
||||
name: "操作",
|
||||
@ -166,7 +166,7 @@ export default function () {
|
||||
label: "参数编码",
|
||||
prop: "code",
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入描述" },
|
||||
elparams: { placeholder: "请输入参数编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
|
@ -87,16 +87,9 @@ export default function () {
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入混料程序编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
forceDisabled: true,
|
||||
prop: 'shapeCode',
|
||||
label: '当前砖型'
|
||||
},
|
||||
{
|
||||
select: true,
|
||||
label: "选择新砖型",
|
||||
label: "砖型",
|
||||
prop: "shapeId",
|
||||
options: [],
|
||||
refreshOptionsAfterConfirm: true,
|
||||
@ -105,6 +98,13 @@ export default function () {
|
||||
fetchData: (techId = -1) => this.$http.get("/pms/shape/listUnR", { params: { wsId: 4, externalCode: '', key: '', techId } }),
|
||||
},
|
||||
],
|
||||
// [
|
||||
// {
|
||||
// forceDisabled: true,
|
||||
// prop: 'shapeCode',
|
||||
// label: '当前砖型'
|
||||
// },
|
||||
// ],
|
||||
// {
|
||||
// select: true,
|
||||
// label: "砖型",
|
||||
@ -129,11 +129,11 @@ export default function () {
|
||||
// { prop: "createTime", label: "添加时间", filter: timeFilter },
|
||||
{ prop: "name", label: "参数名称", isEditField: true },
|
||||
{ prop: "code", label: "参数编码", isEditField: true },
|
||||
{ prop: "specifications", 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: "value", label: "设定值", isEditField: true },
|
||||
{ prop: "valueFloor", label: "值下限", isEditField: true },
|
||||
{ prop: "valueTop", label: "值上限", isEditField: true },
|
||||
{
|
||||
prop: "operations",
|
||||
name: "操作",
|
||||
@ -167,7 +167,7 @@ export default function () {
|
||||
label: "参数编码",
|
||||
prop: "code",
|
||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||
elparams: { placeholder: "请输入描述" },
|
||||
elparams: { placeholder: "请输入参数编码" },
|
||||
},
|
||||
],
|
||||
[
|
||||
|
Loading…
Reference in New Issue
Block a user