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= ({
			@@ -146,6 +147,13 @@
			}


			const showSimpleOrderId = ref(true);

			// 2. 切换显示状态的函数
			const toggleOrderDisplay = () => {
			showSimpleOrderId.value = !showSimpleOrderId.value;
			};



			defineExpose({
			@@ -175,7 +183,9 @@
			</tr>
			<tr>
			<th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{itme1.delivery.customerName}}</span></th>
			<th style="text-align: left;border:none;" colspan="3">项目名称：<span>{{itme1.delivery.project}}</span></th>
			<th style="text-align: left;border:none;" v-if="itme1.data[0].DeliveryDetail.order.batch!==''" colspan="3">
			项目名称：<span>{{itme1.delivery.project}}({{itme1.data[0].DeliveryDetail.order.batch}})</span></th>
			<th style="text-align: left;border:none;" v-else colspan="3">项目名称：<span>{{itme1.delivery.project}}</span></th>
			<th style="text-align: left;border:none;" colspan="2">联系人：<span>{{itme1.delivery.contacts}}</span></th>
			</tr>
			<tr>
			@@ -192,13 +202,14 @@
			<thead>
			<tr v-if="index===0">
			<th style="width: 6%;">序号</th>
			<th style="width: 15%;">楼层编号</th>
			<th style="width: 10%;">楼层编号</th>
			<th style="width: 7%;">箱号</th>
			<th style="width: 17%;" colspan="1">宽X高</th>
			<th style="width: 10%;">数量</th>
			<th style="width: 10%;">面积</th>
			<th style="width: 10%;">单价</th>
			<th style="width: 12%;">金额</th>
			<th style="width: 20%;" colspan="2">加工要求</th>
			<th style="width: 18%;" colspan="2">加工要求</th>
			</tr>


			@@ -206,14 +217,21 @@
			<tr>
			<td style="font-size: 15px;text-align: left" colspan="4">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
			<td v-if="company.showDeliveryCreator" style="font-size: 15px;text-align: left" colspan="2">订货日期:<span>{{item.DeliveryDetail.order.contractId}}</span></td>
			<td style="font-size: 15px;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
			<td style="font-size: 15px;text-align: left" v-show="showSimpleOrderId"
			@dblclick="toggleOrderDisplay" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
			<td style="font-size: 15px;text-align: left" v-show="!showSimpleOrderId"
			@dblclick="toggleOrderDisplay" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}({{item.DeliveryDetail.order.batch}})</span></td>
			</tr>

			<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
			<td>{{items.order_number}}</td>
			<td>{{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.buildingNumber}}</td>
			<td >{{items.box_no}}</td>
			<!-- <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null && company.companyName==='金华福喜天成玻璃有限公司')">{{JSON.parse(items.other_columns).S02}}</td>-->
			<td colspan="1" style="font-size: 15px;font-weight: bold;" >
			{{items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null )?"("+JSON.parse(items.other_columns).S02+")":''}}
			{{items.width}}x{{items.height}}
			</td>
			<td>{{items.quantity}}</td>
			<td>{{items.area}}</td>
			<td>{{items.price}}</td>
			@@ -221,7 +239,7 @@
			<td colspan="2">{{items.processingNote}}</td>
			</tr>
			<tr class="day-in" >
			<td style="font-size: 15px;" colspan="3">小计:</td>
			<td style="font-size: 15px;" colspan="4">小计:</td>
			<td>{{item.DeliveryDetail.quantity}}</td>
			<td>{{item.DeliveryDetail.area}}</td>
			<td></td>
			@@ -231,7 +249,7 @@

			</template>
			<tr class="day-in">
			<td style="font-size: 15px;" colspan="3">合计:</td>
			<td style="font-size: 15px;" colspan="4">合计:</td>
			<td>{{itme1.delivery.quantity}}</td>
			<td>{{itme1.delivery.area}}</td>
			<td></td>
			@@ -241,10 +259,10 @@
			<tr class="day-in">
			<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
			<div style="display: flex;font-size: 10px;text-align: center;">
			<span style="width: 25%">加工费用</span>
			<span style="width: 25%">单价</span>
			<span style="width: 25%">数量</span>
			<span style="width: 25%">金额</span>
			<span style="width: 25%;font-weight: bold;font-size: 12px">加工费用</span>
			<span style="width: 25%;font-weight: bold;font-size: 12px">单价</span>
			<span style="width: 25%;font-weight: bold;font-size: 12px">数量</span>
			<span style="width: 25%;font-weight: bold;font-size: 12px">金额</span>
			</div>
			</td>
			<td style="text-align: left;border:none;font-size: 15px;" colspan="5">总金额:    {{itme1.delivery.money}}</td>
			@@ -300,7 +318,7 @@
			<tr class="day-in" style="border: 0;">
			<td colspan="9" style="border: 0;">
			<div style="display:flex;text-align: left;border: 0;margin-top: 10px " class="bottom" >
			<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 20 }" v-model="remark"/>
			<el-input type="textarea" :autosize="{ minRows: 7, maxRows: 20 }" v-model="remark"/>
			</div>

			</td>