ERP_override.git

			@@ -181,9 +181,10 @@
			</thead>
			<tr style="border-style: none">
			<td style="font-size: 15px;font-weight: bold;text-align: left" colspan="9">
			产品名称:<span>{{data.orderProductDetail[index].productName}}</span>
			产品名称:<span>{{item.productName}}</span>
			</td>
			</tr>

			<tr class="day-in" v-for="(items, index1) in item.productDetail" :key="index1">
			<td>{{items.orderNumber}}</td>
			<td>{{items.buildingNumber}}</td>

			@@ -259,6 +259,7 @@
			{field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
			{field: 'orderDetail.quantity', title: t('order.quantity'),},
			{field: 'order.creator', title: t('order.creator'),},
			{field: 'founder', title: t('product.creator'),},
			],//表头按钮
			data: null,//表格数据
			toolbarConfig: {

			@@ -8,6 +8,7 @@
			<result column="order_id" property="orderId"/>
			<result column="production_id" property="productionId"/>
			<result column="splitting_status" property="splittingStatus"/>
			<result column="founder" property="founder"/>
			<result column="create_time" property="createTime"/>
			<!--接收其他外键实体类数据-->
			<result column="batch" property="order.batch"/>
			@@ -78,6 +79,7 @@
			o.order_id,
			od.order_number,
			ogd.production_id,
			ogd.founder,
			o.batch,
			o.project,
			o.order_type,

	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史