north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -88,17 +88,28 @@ customer.value = produceList.value[0].detail[0] let height = 0 let index = 0 produceList.value[0].detailList.forEach(order => { if(orderDetailList.value[index]===undefined){ orderDetailList.value[index]=[] for(let i=0;i<produceList.value.length;i++){ //换产品就换页 if(i>0){ index+=1 } orderDetailList.value[index]=[] orderDetailList.value[index].push({ type:'customer', customer:produceList.value[i].detail[0] }) produceList.value[i].detailList.forEach(order => { height+=50 //判断高度是否超过350，则换页 if(height>=500){ height=0 index+=1 orderDetailList.value[index]=[] orderDetailList.value[index].push({ type:'customer', customer:produceList.value[i].detail[0] }) } orderDetailList.value[index].push({ type:'product', @@ -119,6 +130,7 @@ }) }) }) } orderDetailList.value.forEach((page,index)=>{ let sum = { quantity:0, @@ -179,23 +191,23 @@ <div style="display:flex;"> <div style="width: 100%"><span style="font-weight: bold;">客户名称</span>： <input class="contactNumber" style="width: 80%;font-size: 9px" type="text" v-model="customer.customer_name" /> v-model="page[0].customer.customer_name" /> </div> </div> <div style="display:flex;"> <div style="width: 100%"><span style="font-weight: bold">工程名称</span>：{{customer.project}}</div> <div style="width: 100%"><span style="font-weight: bold">工程名称</span>：{{page[0].customer.project}}</div> </div> <div style="display:flex;"> <div style="width: 50%"><span style="font-weight: bold">订单号</span>：{{customer.order_id}}</div> <div style="width: 50%"><span style="font-weight: bold">装箱单号</span>：{{customer.remarks}}</div> <div style="width: 50%"><span style="font-weight: bold">订单号</span>：{{page[0].customer.order_id}}</div> <div style="width: 50%"><span style="font-weight: bold">装箱单号</span>：{{page[0].customer.remarks}}</div> </div> <div style="display:flex;"> <div style="width: 50%"><span style="font-weight: bold">包装日期</span>：{{customer.reporting_work_time}}</div> <div style="width: 50%"><span style="font-weight: bold">本架数量</span>：{{customer.quantity}}</div> <div style="width: 50%"><span style="font-weight: bold">包装日期</span>：{{page[0].customer.reporting_work_time}}</div> <div style="width: 50%"><span style="font-weight: bold">本架数量</span>：{{page[0].customer.quantity}}</div> </div> <div style="display:flex;"> <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">加工班组</span>：{{customer.teams_groups_name2}}</div> <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">包装班组</span>：{{customer.teams_groups_name}}</div> <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">加工班组</span>：{{page[0].customer.teams_groups_name2}}</div> <div style="width: 50%;font-size: 9px"><span style="font-weight: bold">包装班组</span>：{{page[0].customer.teams_groups_name}}</div> </div> <div style="display:flex;"> <div style="width: 50%"><span style="font-weight: bold">质量检验</span>：刘化菊</div> @@ -231,7 +243,7 @@ <td>{{ row.size.area }}</td> </tr> <tr id="footsum" v-else style="border: 0;font-size: 10px"> <tr id="footsum" v-else-if="row.type==='sum'" style="border: 0;font-size: 10px"> <td colspan="5" style="border: 0;"> <div style="display:flex;"> <div>本页数量</div> north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue
@@ -258,7 +258,7 @@ <td colspan="6"> <el-row :gutter="20"> <el-col :span="2"></el-col> <el-col :span="12" style="font-size: 17px;font-weight: bold"> {{delivery.orderId }}</el-col> <el-col :span="12" style="font-size: 16px"> {{delivery.orderId }}</el-col> </el-row> </td> </tr> @@ -302,16 +302,16 @@ </td> </tr> <tr> <tr id="table-sum"> <td id="sum_td"></td> <td></td> <td></td> <td> <td style="width: 65px" > {{getQuantitySum(pageIndex)}} </td> <td> <input style="border: 0;width: 100px" :value="getAreaSum(pageIndex)"> <td style="width: 100px"> <input style="border: 0;width: 100px;font-size: 17px" :value="getAreaSum(pageIndex)"> </td> <td></td> <td style="width: 80px"></td> <td v-if="props.type===1"> {{getMoneySum(pageIndex)}} </td> @@ -350,7 +350,7 @@ text-align: center; } tbody *{ font-size: 12px; font-size: 14px; } #footsum1,#footsum{ font-weight: bold;font-size: 17px; @@ -368,6 +368,14 @@ bottom: 1cm; width: 100%; /* 或者设置成具体的宽度 */ } #table-sum { position: absolute; /* 或者使用 relative，根据具体需求 */ bottom: 5cm; } #sum_td{ width: 9cm; } } .textarea{ @@ -381,7 +389,7 @@ :deep(.el-textarea__inner){ color: #333333; font-family: 'Microsoft YaHei', '微软雅黑', sans-serif; font-size: 12px; font-size: 14px; } :deep(.aaa){ width: 150px; @@ -389,4 +397,7 @@ :deep(.bbb){ width: 5cm; } :deep(#table-sum td){ font-size: 17px; } </style> north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue
@@ -318,7 +318,7 @@ <td colspan="6"> <el-row :gutter="20"> <el-col :span="2"></el-col> <el-col :span="12" style="font-size: 17px;font-weight: bold"> {{ delivery.orderId }}</el-col> <el-col :span="12" style="font-size: 16px;"> {{ delivery.orderId }}</el-col> </el-row> </td> </tr> @@ -373,18 +373,18 @@ </tr> </template> <tr> <tr id="table-sum"> <td id="sum_td"></td> <td></td> <td></td> <td></td> <td></td> <td> <td style="width: 60px"> {{ getQuantitySum(pageIndex) }} </td> <td> <td style="width: 100px"> <input style="border: 0;width: 100px" :value="getAreaSum(pageIndex)"> </td> <td></td> <td style="width: 80px"></td> <td v-if="props.type===1||props.type===3"> {{ getMoneySum(pageIndex) }} </td> @@ -428,7 +428,7 @@ } tbody * { font-size: 12px; font-size: 14px; } #footsum1, #footsum { @@ -447,6 +447,13 @@ position: fixed; bottom: 1cm; width: 100%; /* 或者设置成具体的宽度 */ } #table-sum { position: absolute; /* 或者使用 relative，根据具体需求 */ bottom: 5cm; } #sum_td{ width: 9cm; } } @@ -470,8 +477,10 @@ :deep(.el-textarea__inner) { color: #333333; font-family: 'Microsoft YaHei', '微软雅黑', sans-serif; font-size: 12px; font-size: 14px; } :deep(#table-sum td){ font-size: 17px; } </style> north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -41,7 +41,7 @@ mergeCells:[], toolbarConfig: { zoom: true, custom: true /*custom: true*/ }, cellClassName ({ row, column,columnIndex}) { if (columnIndex>10 && row.thisQuantity*1 === row.reportWorkQuantity[column.title]*1){ north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCardDetail.vue
@@ -96,8 +96,18 @@ } ); watch(() => props.technologyNumber, (newValue, oldValue) => { if (props.technologyNumber != null) { getWorkOrder(); } }); const getWorkOrder = () => { if (props.processId!=null || props.processId!=""){ if ((props.processId != null && props.processId != "") && (props.technologyNumber != null && props.technologyNumber != "")) { request.post(`/glassOptimize/getProcessCardDetail/${props.processId}/${props.technologyNumber}`).then((res) => { if(res.code==200){ xGrid.value.loadData(res.data.data) @@ -106,7 +116,6 @@ } }) } } </script>
@@ -388,7 +388,7 @@ public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Map<String,Object> config,Integer orderType) { Integer offset = (pageNum-1)*pageSize; String endDate = LocalDate.now().toString(); String startDate = LocalDate.now().minusDays(15).toString(); String startDate = LocalDate.now().minusDays(365).toString(); if(selectDate !=null && selectDate.size()==2){ if(!selectDate.get(0).isEmpty()){ startDate = selectDate.get(0); north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -804,7 +804,8 @@ and fol.remarks regexp #{finishedOperateLog.remarksr} </if> </where> group by fol.remarks,od.order_id,fol.process_id group by fol.remarks,od.order_id -- ,fol.process_id order by fol.operate_time desc limit #{offset},#{pageSize}; </select> north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -110,7 +110,7 @@ sd.`order` as o left join mm.finished_goods_inventory as fgi on o.order_id = fgi.order_id where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate} where date(o.create_time) between #{startDate} and #{endDate} <if test="orderType!= null and orderType != ''"> and o.create_order = #{orderType}
