ERP_override.git

			@@ -57,9 +57,9 @@
			{field: 'thickness', width: 50, title: '厚度',},
			{field: 'type', width: 50, title: '类型',},
			{field: 'state', width: 50, title: '状态',},
			{field: 'temperingState', width: 50, title: '钢化模拟',filters: [{data: ''}], slots: {filter: 'num1_filter'},
			{field: 'temperingState', width: 50, title: '钢化模拟', filters: [{data: ''}], slots: {filter: 'select_filter1'},
			filterMethod:filterChanged, formatter: ({ cellValue }) => cellValue === 1 ? '是' : (cellValue === 0 ? '否' : cellValue)},
			{field: 'optimizeState', width: 50, title: '优化计算',filters: [{data: ''}], slots: {filter: 'num1_filter'},
			{field: 'optimizeState', width: 50, title: '优化计算', filters: [{data: ''}], slots: {filter: 'select_filter1'},
			filterMethod:filterChanged,formatter: ({ cellValue }) => cellValue === 1 ? '是' : (cellValue === 0 ? '否' : cellValue)},
			{field: 'quantity', width: 50, title: '数量',},
			{field: 'area', width: 50, title: '面积',},
			@@ -880,6 +880,17 @@
			</div>
			</template>

			<template #select_filter1="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			<vxe-select v-model="option.data" @change="changeFilterEvent($event, option, $panel)">
			<vxe-option value="1" label="是"></vxe-option>
			<vxe-option value="0" label="否"></vxe-option>
			</vxe-select>
			</div>
			</div>
			</template>

			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">

			@@ -473,7 +473,7 @@
			<!--库存信息-->
			<select id="materialStoreMp">
			SELECT
			i.id AS id,
			i.material_code AS id,
			i.producer AS producer,
			i.available_quantity-i.plan_quantity AS available_quantity,
			null as processingQuantity,
			@@ -570,7 +570,7 @@


			<select id="materialStoreOptimizeUse">
			select ms.id AS id,
			select ou.raw_stock_code AS id,
			ou.use_count AS processingQuantity,
			ou.width,
			ou.height,

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史