north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -243,10 +243,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> @@ -302,7 +302,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> north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -73,6 +73,14 @@ } const Url = '' const changeBold = (e) =>{ if(e.currentTarget.className !=='bold'){ e.currentTarget.className ='bold' }else{ e.currentTarget.className ='' } } </script> @@ -228,7 +236,7 @@ <tr> <td colspan="17" style="white-space: pre-wrap;text-align:left "> <template v-for="(item,index) in data.order.processingNote.split('\n')"> {{item}} <el-text @click="changeBold($event)" v-for="val in item.split('')">{{val}}</el-text> <br> </template> </td> @@ -297,4 +305,8 @@ margin: 5mm; /* 设置打印页面的边距 */ } } .bold { font-weight: bold; font-size: 16px; } </style> north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -71,7 +71,7 @@ <!--查询筛选后唯一的流程卡号--> <select id="filterOrderProcess"> select * from( select max(id) as id,process,order_number,technology_number,b.nickname, select a.* from( select id as id,process,order_number,technology_number,b.nickname, case b.nickname when '' then 1 when null then 1 when 'stepC' then 2 @@ -80,12 +80,26 @@ when 'stepB' then 4 end as sort from order_process_detail left join (select DISTINCT basic_name,nickname from basic_data where basic_category = 'process') as b on b.basic_name = process where order_id = #{orderId} group by process) as a order by sort,id left join (SELECT max(count) as count,process from (SELECT count(opd1.id) as count,opd.process from order_process_detail as opd LEFT JOIN (SELECT id,process_id,order_number,technology_number from order_process_detail where order_id = #{orderId}) as opd1 on opd.process_id = opd1.process_id and opd.order_number = opd1.order_number and opd.technology_number = opd1.technology_number and opd.id>=opd1.id where opd.order_id =#{orderId} group by opd.id) as a GROUP BY process) as sort1 on sort1.process = a.process order by sort,sort1.count,id </select>
