ERP_override.git

			@@ -155,7 +155,7 @@
			<th>规格（宽W*高H）</th>
			<th>片数</th>
			<th>面积</th>
			<th>延米</th>
			<th>{{company.columnNamePerimeter}}</th>
			<th>楼号</th>
			<th>加工要求</th>
			<th>备注</th>
			@@ -193,7 +193,7 @@
			</tr>

			<tr>
			<td colspan="4">小计</td>
			<td colspan="5">小计</td>
			<td>{{getQuantity(item.productDetail)}}</td>
			<td>{{getArea(item.productDetail)}}</td>
			<td>{{getPerimeter(item.productDetail)}}</td>
			@@ -203,11 +203,11 @@

			</tbody>
			<tr>
			<td colspan="4">总计</td>
			<td colspan="5">总计</td>
			<td>{{grossNum.quantity}}</td>
			<td>{{grossNum.grossArea}}</td>
			<td>{{grossNum.perimeter}}</td>
			<td colspan="8"></td>
			<td colspan="6"></td>
			</tr>
			<tr>
			<td colspan="15" style="white-space: pre-wrap;text-align:left ">

			@@ -137,7 +137,7 @@
			<th>规格（宽W*高H）</th>
			<th>片数</th>
			<th>面积</th>
			<th>延米</th>
			<th>{{company.columnNamePerimeter}}</th>
			<th>半径</th>
			<th>楼号</th>
			<th>加工要求</th>

			@@ -366,13 +366,17 @@
			{
			confirmButtonText: t('basicData.confirmButtonText'),
			cancelButtonText: t('basicData.cancelButtonText'),
			distinguishCancelAndClose: true,
			type: 'warning',
			}
			).then(()=>{
			errorAreaComputed()
			selectOrder(order)
			}).catch(()=>{
			selectOrder(order)
			}).catch((action)=>{
			if(action === 'cancel'){
			selectOrder(order)
			}

			})

			}else {

	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史