ERP_override.git

			@@ -1,4 +1,5 @@
			<script setup>
			/生产加工单竖版/
			import request from "@/utils/request"
			import {computed, onMounted, ref} from "vue"
			import PrintFoot from "@/components/sd/order/PrintFoot.vue"
			@@ -187,10 +188,10 @@
			<tr v-if="index===0">
			<th style="width: 6%;font-weight: bold;">序</th>
			<th style="width: 15%;font-weight: bold;" >楼层编号</th>
			<th style="width: 25%;font-weight: bold;" colspan="3">宽X高</th>
			<th style="width: 20%;font-weight: bold;" colspan="3">宽X高</th>
			<th style="width: 8%;font-weight: bold;">数量</th>
			<th style="width: 12%;font-weight: bold;">面积</th>
			<th style="width: 17%;font-weight: bold;" colspan="2">加工要求</th>
			<th style="width: 22%;font-weight: bold;" colspan="2">加工要求/备注</th>
			</tr>


			@@ -213,7 +214,7 @@
			<td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
			<td style="font-size: 20px;font-weight: bold;">{{items.quantity}}</td>
			<td style="font-size: 20px;font-weight: bold;">{{items.grossArea.toFixed(2)}}</td>
			<td colspan="2">{{items.processingNote}}</td>
			<td colspan="2">{{items.processingNote}}/{{items.remarks}}</td>
			</tr>
			<tr class="day-in" >
			<td style="font-size: 15px;font-weight: bold;" colspan="5">小计:</td>

			@@ -397,7 +397,10 @@
			concat(a.width," * " , a.height) as size,
			b.area,
			b.glass_child as glassChild,
			d.product_name as productName
			d.product_name as productName,
			d.building_number as buildingNumber,
			d.remarks as remarks,
			d.processing_note as processingNote
			from pp.optimize_heat_detail as a
			left join sd.order_glass_detail as b
			on b.order_number = a.order_sort

	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史