浏览代码

修改物料采集中新增弹框到bom的操作 但未完成

ooo 1 年之前
父节点
当前提交
32e9eb8384

+ 44 - 0
src/components/CommonTable/configs/tableConfig.ts

@@ -411,5 +411,49 @@ export const tableConfig = {
       },
     ],
   },
+	
+	MARTERIAL_BOM: {
+		url: "/api/v1/base/materialBom/list",
+		column: [
+		  {
+		    label: "物料编码",
+		    prop: "materialCode",
+		    hide:true
+		  },
+		
+		  {
+		    label: "物料名称",
+		    prop: "materialName",
+		    overHidden:true,
+		    hide:true
+		  },
+		
+		  {
+		    label: "物料编码",
+		    prop: "bomMaterialCode",
+		  },
+		  {
+		    label: "物料名称",
+		    prop: "bomMaterialName",
+		    overHidden:true,
+		  },
+		  {
+		    label: "物料属性",
+		    prop: "bomMaterialAttribute",
+		    type: 'select',
+		    dicData:dicts.material_properties,
+		    props: { label: "dictLabel", value: "dictValue" },
+		  },
+		  {
+		    label: "物料数量",
+		    prop: "bomMaterialNumber",
+		    min:0,
+		    slot:true,
+		    cell: true,
+		    type: "number",
+		    precision: 2,
+		  },
+		],
+	},
 
 };

+ 1 - 1
src/views/base/craftManagement/route/components/bottomTable.vue

@@ -92,7 +92,7 @@ const onSortChange = () => {
 
 // ============公共弹窗table选择相关,物料采集等使用===============
 const commonTableRef = ref({});
-const commonTableType = ref("MARTERIAL");
+const commonTableType = ref("MARTERIAL_BOM");
 const onSelectedFinish = (itemValue) => {
   crudRef.value && crudRef.value.rowAdd();
   if (props.tableType === "wuliaocaiji") {

+ 3 - 2
src/views/base/craftManagement/route/components/processComponent.vue

@@ -146,6 +146,7 @@ const clickToolCom = (com, index) => {
     ElMessage.warning("请先保存组件!!!");
     return;
   }
+  tipTitle = '编辑'+com.compentName
   selectIndex.value = index;
   currentCom.value = com;
   if (com.compentType === "mingpai" || com.compentType === "duomeiticaiji") {
@@ -173,9 +174,9 @@ const getNameClass = (index) => {
 };
 
 // 底部table ===============
-const tipTitle = ref("编辑物料采集");
+let tipTitle = ref("编辑物料采集");
 const bottomTableRef = ref({});
-const tableType = ref("MARTERIAL");
+const tableType = ref("MARTERIAL_BOM");
 
 const creatNewData = () => {
   bottomTableRef.value && bottomTableRef.value.startCreat();