ERP_override.git

			@@ -149,12 +149,12 @@

			<template>
			<div >
			<div :class="'div_'+n " style="width: 46%;position: relative;" v-for="n in 2" >
			<div :class="'div_'+n " style="width: 46%;position: relative;margin-top: 20px" v-for="n in 2" >
			<table v-for="page in orderDetailList" :key="page" style="width: 100%">
			<thead>
			<tr>
			<td colspan="1" style="text-align: center;font-weight: bolder;">
			<div style="width: 60px;height: 60px">
			<div style="width: 35px;height: 35px">
			<img id="img-pic" style="width:100%;height: 100%" src="@/assets/northGlass.ico" alt="">
			</div>
			</td>
			@@ -178,7 +178,7 @@
			<td colspan="5">
			<div style="display:flex;">
			<div style="width: 100%"><span style="font-weight: bold;">客户名称</span>：
			<input class="contactNumber" style="width: 60%;font-size: 12px" type="text"
			<input class="contactNumber" style="width: 85%;font-size: 12px" type="text"
			v-model="customer.customer_name" />
			</div>
			</div>
			@@ -219,7 +219,7 @@
			<tbody>
			<template v-for="(row,index) in page" :key="row">
			<tr v-if="row.type==='product'" style="width: 100%;height: 100px" >
			<td colspan="1" style="font-weight: bold;font-size: 13px">加工品种:</td>
			<td colspan="1" style="font-weight: bold;font-size: 11px">加工品种:</td>
			<td colspan="4">
			<textarea style="resize: none;width: 100%;height: 100px;border: 0" class="textarea" type="textarea" v-model="row.productName" /></td>
			</tr>
			@@ -317,12 +317,12 @@
			}
			#footsum{
			position: fixed;
			bottom: 2cm;
			bottom: 1.5cm;
			width: 100%; /* 或者设置成具体的宽度 */
			}
			#sticky-footer {
			position: fixed;
			bottom: 1cm;
			bottom: 0.5cm;
			width: 100%; /* 或者设置成具体的宽度 */
			}
			/* thead{

			@@ -926,7 +926,7 @@

			<select id="getDetailLists">
			SELECT
			ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'')) as building_number,
			ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
			od.width,
			od.height,
			fol.quantity,

			@@ -596,7 +596,7 @@
			rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}

			AND dd.available = 0
			AND dd.available = 0 and rw.reviewed_state>=0
			<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
			and o.order_id regexp #{damageReportDTO.orderId}
			</if>
			@@ -1021,7 +1021,7 @@
			AND dd.technology_number = ogd.technology_number
			WHERE rw.reporting_work_time >= #{dates[0]}
			and rw.reporting_work_time <= #{dates[1]}
			AND dd.available = 0
			AND dd.available = 0 and rw.reviewed_state>=0
			GROUP BY dd.id
			</select>

	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史