north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -192,13 +192,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> @@ -211,10 +212,10 @@ <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1"> <td>{{items.order_number}}</td> <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td> <td v-else>{{items.buildingNumber}}</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="2" style="font-size: 15px;font-weight: bold;" > <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> @@ -225,7 +226,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> @@ -235,7 +236,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> north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -138,7 +138,8 @@ <thead> <tr v-if="index===0"> <th style="width: 6%;">序号</th> <th style="width: 20%;">楼层编号(箱号)</th> <th style="width: 10%;">楼层编号</th> <th style="width: 10%;">箱号</th> <th style="width: 20%;" colspan="2">宽X高</th> <th style="width: 10%;">数量</th> <th style="width: 10%;">面积</th> @@ -148,15 +149,15 @@ </thead> <tr> <td style="font-size: 15px;text-align: left" colspan="4">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td> <td 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="5">产品名称:<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> </tr> <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1"> <td>{{items.order_number}}</td> <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td> <td v-else>{{items.buildingNumber}}</td> <td >{{items.buildingNumber}}</td> <td >{{items.box_no}}</td> <!-- <td colspan="2" 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="2" style="font-size: 15px;font-weight: bold;" > {{items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null )?"("+JSON.parse(items.other_columns).S02+")":''}} @@ -167,14 +168,14 @@ <td colspan="3">{{items.processingNote}}</td> </tr> <tr class="day-in" > <td style="font-size: 15px;" colspan="4">小计:</td> <td style="font-size: 15px;" colspan="5">小计:</td> <td>{{item.DeliveryDetail.quantity}}</td> <td>{{item.DeliveryDetail.area}}</td> </tr> </template> <tr class="day-in"> <td style="font-size: 15px;" colspan="4">合计:</td> <td style="font-size: 15px;" colspan="5">合计:</td> <td>{{itme1.delivery.quantity}}</td> <td>{{itme1.delivery.area}}</td> </tr> north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
@@ -151,7 +151,7 @@ request.post(`/processCard/selectPrintProjectDetails/${projectNo}`).then((res) => { if (res.code == 200) { xGrid.value.loadData(res.data.data) xGrid.value.reloadData(res.data.data) gridOptions.loading = false } else { ElMessage.warning(res.msg) north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -65,7 +65,6 @@ gridOptions.columns = gridOptions.columns.slice(0, 11); //清除动态生成的列重新查询 request.post(`/report/processCardProgressReport/${form.orderId}`, column).then((res) => { if (res.code == 200) { console.log(res.data.data) if (res.data.data.length === 0) { ElMessage.warning(t('report.noDataFoundForThisOrder')) return
