Переглянути джерело

update 0727 docs

docs_0727
lb 1 рік тому
джерело
коміт
ce29b3ca9b
2 змінених файлів з 36 додано та 28 видалено
  1. +24
    -22
      src/views/modules/pms/bom/config.js
  2. +12
    -6
      src/views/modules/pms/bomTechAndFiring/components/edit.vue

+ 24
- 22
src/views/modules/pms/bom/config.js Переглянути файл

@@ -7,10 +7,12 @@ import techBox from "@/components/noTemplateComponents/techBox";
export default function () {
const tableProps = [
{ type: "index", label: "序号" },
{ prop: "code", label: "配方号" },
{ width: 160, prop: "code", label: "配方号" },
{ prop: "name", label: "牌号" },
{ prop: "syncTime", label: "同步时间", filter: timeFilter },
{ prop: "techCode", label: "烧制曲线", subcomponent: techBox },
{ width: 90, prop: "techCode", label: "烧制曲线", subcomponent: techBox },
{ prop: "upweight", label: "建议混料上限" },
{ prop: "downweight", label: "建议混料下限" },
// { prop: "externalCode", label: "版本号" },
// { prop: "specifications", label: "程序号" },
// { prop: "unitDictValue", label: "砖型", filter: dictFilter("unit") },
@@ -29,19 +31,19 @@ export default function () {
actionName: "to-bom-detail",
emitFullData: true,
},
// {
// prop: "operations",
// name: "操作",
// fixed: "right",
// width: 120,
// subcomponent: TableOperaionComponent,
// options: [
// { name: "sync", label: "同步", icon: "refresh", emitFull: true, showOverlay: true }
// // { name: "copy", label: "复制", icon: "copy-document" },
// // { name: "edit", label: "编辑", icon: "edit-outline" },
// // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bom:delete" },
// ],
// },
{
prop: "operations",
name: "操作",
fixed: "right",
width: 120,
subcomponent: TableOperaionComponent,
options: [
{ name: "sync", label: "同步", icon: "refresh", emitFull: true, showOverlay: true }
// { name: "copy", label: "复制", icon: "copy-document" },
// { name: "edit", label: "编辑", icon: "edit-outline" },
// { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bom:delete" },
],
},
];

const headFormFields = [
@@ -72,12 +74,12 @@ export default function () {
// permission: "pms:bom:save",
// },
// },
// {
// button: {
// type: "plain",
// name: "同步",
// },
// },
{
button: {
type: "warning",
name: "批量同步",
},
},
];

const dictList = JSON.parse(localStorage.getItem("dictList") || {});
@@ -267,7 +269,7 @@ export default function () {
subpage: "/pms/bomMaterial/page",
importUrl: "/pms/order/importExcelBom", // 导入的api
templateUrl: "/importTemplates/bomImport.xlsx",
syncSingleUrl: "/pms/trans/bomSync"
syncSingleUrl: "/pms/trans/bomSync",
},
};
}

+ 12
- 6
src/views/modules/pms/bomTechAndFiring/components/edit.vue Переглянути файл

@@ -34,11 +34,16 @@
<el-col>
<el-form-item label="工艺" prop="techId" :rules="rules.tech">
<el-select v-model="dataForm.techId" filterable clearable>
<el-option
v-for="(tech, index) in techList"
:key="index"
:label="tech.label"
:value="tech.value"></el-option>
<el-option v-for="(tech, index) in techList" :key="tech.label" :label="tech.label" :value="tech.value">
<div style="display: flex; align-items: center">
<span style="display: inline-block; width: 150px; overflow: hidden; text-overflow: ellipsis">
{{ tech.label }}
</span>
<span style="display: inline-block; margin-left: 12px; font-size: 0.9em">
{{ tech.remark || "无" }}
</span>
</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
@@ -71,7 +76,7 @@ export default {
rules: {
code: [],
name: [],
tech: []
tech: [],
// name: [{ required: true, message: "必填项不能为空", trigger: "blur" }],
},
techList: [],
@@ -108,6 +113,7 @@ export default {
return {
label: item.code,
value: item.id,
remark: item.remark,
};
});
}


Завантаження…
Відмінити
Зберегти