ERP_override.git

			@@ -39,6 +39,7 @@

			request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
			if(res.code==200){
			console.log(res.data)
			produceList.value = deepClone(res.data)
			for(let i=0;i<produceList.value.length;i++){
			let produceList1= ({
			@@ -192,7 +193,7 @@
			<thead>
			<tr v-if="index===0">
			<th style="width: 6%;">序号</th>
			<th style="width: 15%;">楼层编号</th>
			<th style="width: 15%;">楼层编号(箱号)</th>
			<th style="width: 17%;" colspan="1">宽X高</th>
			<th style="width: 10%;">数量</th>
			<th style="width: 10%;">面积</th>
			@@ -211,7 +212,8 @@

			<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
			<td>{{items.order_number}}</td>
			<td>{{items.buildingNumber}}</td>
			<td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
			<td v-else>{{items.buildingNumber}}</td>
			<td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
			<td colspan="1" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
			<td>{{items.quantity}}</td>

			@@ -155,7 +155,8 @@

			<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
			<td>{{items.order_number}}</td>
			<td>{{items.buildingNumber}}</td>
			<td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
			<td v-else>{{items.buildingNumber}}</td>
			<td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
			<td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
			<td>{{items.quantity}}</td>

			@@ -1200,6 +1200,7 @@
			dd.area,
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.building_number,"") as buildingNumber,
			dd.box_no,
			dd.price,
			od.other_columns,
			od.remarks

	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史