diff --git a/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/Edit.vue b/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/Edit.vue index 9c1de57..5185458 100644 --- a/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/Edit.vue +++ b/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/Edit.vue @@ -116,6 +116,9 @@ export default { { field: 'code', title: '编码', span: 24, itemRender: { name: '$input' } }, // { field: 'type', title: '包装材料类型', span: 12, itemRender: { name: '$input' } }, { field: 'unit', title: '包装材料单位', span: 24, itemRender: { name: '$input' } }, + { field: 'default_quantity', title: '默认数量', span: 24, itemRender: { name: '$input' } }, + + // { field: 'valuation', title: '计价方式: 1.按重量计价,2.按体积计价,3.按数量计价,4.按面积计价,5.按长度计价', span: 12, itemRender: { name: '$input' } }, // { field: 'image', title: '图片', span: 12, itemRender: { name: '$input' } }, { field: 'remark', title: '备注', span: 24, itemRender: { name: '$input' } }, diff --git a/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/List.vue b/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/List.vue index 82e8110..9ce97be 100644 --- a/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/List.vue +++ b/src/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/List.vue @@ -161,10 +161,10 @@ export default { // 表格列配置 columns: [ - { type: 'checkbox', width: 'auto' }, // 多选框 + { type: 'checkbox', width: 50 }, // 多选框 { title: '操作', slots: { default: 'op' }, width: 120 }, - { type: 'seq', width: 'auto' }, // 序号 + { type: 'seq', width: 50 }, // 序号 // =============================== 表格列 自动生成 Start =============================== @@ -173,6 +173,7 @@ export default { { field: 'code', sortable: true, title: '编码', width: 250 }, // 编码 { field: 'type', sortable: true, title: '包装材料类型', width: 250 }, // 包装材料类型 { field: 'unit', sortable: true, title: '包装材料单位', width: 250 }, // 包装材料单位 + { field: 'default_quantity', sortable: true, title: '默认数量', width: 250 }, // 默认数量 //{ field: 'valuation', sortable: true, title: '计价方式: 1.按重量计价,2.按体积计价,3.按数量计价,4.按面积计价,5.按长度计价', width: 250 }, // 计价方式: 1.按重量计价,2.按体积计价,3.按数量计价,4.按面积计价,5.按长度计价 //{ field: 'image', sortable: true, title: '图片', width: 250 }, // 图片 { field: 'remark', sortable: true, title: '备注', width: 250 }, // 备注 diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue index 954b356..defa34e 100644 --- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue +++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue @@ -1822,6 +1822,7 @@ export default { if (selectedData && selectedData.default_quantity) { row.quantity = selectedData.default_quantity; // 设置默认数量 + row.quantity_formula = selectedData.default_quantity; } } diff --git a/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue b/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue index ab8ef46..18ed0c9 100644 --- a/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue +++ b/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue @@ -1012,6 +1012,8 @@ export default { if (selectedData && selectedData.default_quantity) { row.quantity = selectedData.default_quantity; // 设置默认数量 + + row.quantity_formula = selectedData.default_quantity; } }