Merge remote-tracking branch 'origin/main'

# Conflicts:
#	js/aq_demand_plan/child/send_out_detail.js

css/aq_demand_plan/send_out_detail.css

@@ -144,3 +144,80 @@ body {
 .page-content {
 	width: 100%;
 }
+
+/* 签字区域样式 */
+#signature-box {
+	width: 100%;
+	margin-top: 30px;
+	flex-direction: column;
+	align-items: baseline;
+	justify-content: space-evenly;
+}
+
+.signature-table {
+	margin-top: 10px;
+}
+
+.signature-table td {
+	vertical-align: top;
+	padding: 15px 10px;
+}
+
+@media print {
+	@page {
+		margin: 0;
+		size: auto;
+	}
+	
+	body {
+		margin: 0;
+		padding: 10px;
+	}
+	
+	.layuimini-container {
+		height: auto !important;
+		min-height: auto !important;
+		max-height: none !important;
+	}
+	
+	.layuimini-main {
+		height: auto !important;
+		min-height: auto !important;
+		max-height: none !important;
+	}
+	
+	.layui-table-page {
+		display: none !important;
+	}
+	
+	.no-print {
+		display: none !important;
+	}
+	
+	/* 避免分页断裂 */
+	table {
+		page-break-inside: avoid;
+	}
+	
+	/* 确保各个区块不会强制分页 */
+	#basic-box,
+	#supplier-box,
+	#file-box,
+	#fhjj-box,
+	#signature-box {
+		page-break-inside: avoid;
+		break-inside: avoid;
+	}
+	
+	/* 调整打印时的高度 */
+	#plan-basic-box {
+		height: auto !important;
+	}
+	
+	/* 签字区域打印样式 */
+	#signature-box {
+		page-break-inside: avoid;
+		break-inside: avoid;
+		margin-top: 20px;
+	}
+}

js/aq_demand_plan/child/choose_tool_type_list.js

@@ -86,7 +86,7 @@ function initTable() {
             limitName: 'pageSize'
         },
         parseData: function (res) { // res 即为原始返回的数据
-            if(res.code === 401){
+            if(res.code === 401) {
                 closeWindowOpen();
             }
             if (jjDetailArr && res.list) {

js/aq_demand_plan/child/send_out_detail.js

@@ -218,17 +218,8 @@ function exportExcel() {
     exportExcelUtil(url, '采购发货明细', JSON.stringify(params));
 }
 
-/*
 // 打印
 function print() {
-
-    // 打印前追加新的内容到 #table-box 内
-    const newElement = document.createElement('div');
-    newElement.innerHTML = '<p>新增内容：这是打印前加上的内容！</p>';
-
-    // 将新的内容插入到 #table-box 内部
-    document.querySelector('#table-box').appendChild(newElement);
-
     Print('#table-box', {
         onStart: function () {
             console.log('onStart', new Date())
@@ -238,7 +229,6 @@ function print() {
         }
     })
 }
-*/
 
 // 预览文件
 function viewFile(obj) {
@@ -275,11 +265,11 @@ function print() {
     $("#main-box").print({
         globalStyles: true,
         mediaPrint: false,
-        stylesheet: '../../../../css/aq_demand_plan/send_out_detail.css',
+        stylesheet: '../../../css/aq_demand_plan/apply_plan_detail.css',
         noPrintSelector: ".no-print",
         iframe: true,
-        append: null,
+        append: '<style>@page { margin: 0; size: auto; } @media print { @page { margin: 0; size: auto; } html { margin: 0; height: auto; } body { margin: 0; height: auto; } .layuimini-container { height: auto !important; } }</style>',
-        prepend: null, // 添加到打印内容的开头
+        prepend: null,
         manuallyCopyFormValues: true,
         deferred: $.Deferred()
     });

js/aq_demand_plan/child/send_out_edit_form.js

@@ -219,7 +219,8 @@ function beforeSubmitApply() {
             let l = list[j];
             cgNum += (l.cgNum ? parseInt(l.cgNum) : 0);
             lkNum += (l.lkNum ? parseInt(l.lkNum) : 0);
-            if (!l.supId) {
+            if (!l.supId && cgNum > 0) {
+                // 采购才需要填写供应商
                 return layer.msg('序号为' + (i + 1) + '的数据，未选择供应商', { icon: 7 });
             }
             if (!l.ccDay) {

js/aq_demand_plan/child/send_out_form.js

@@ -152,7 +152,7 @@ function beforeSubmitApply() {
             let l = list[j];
             cgNum += (l.cgNum ? parseInt(l.cgNum) : 0);
             lkNum += (l.lkNum ? parseInt(l.lkNum) : 0);
-            if (!l.supId) {
+            if (!l.supId && cgNum > 0) {
                 return layer.msg('序号为' + (i + 1) + '的数据，未选择供应商', { icon: 7 });
             }
         }

js/aq_demand_plan/child/send_out_form_device.js

@@ -152,7 +152,8 @@ function beforeSubmitApply() {
             let l = list[j];
             cgNum += (l.cgNum ? parseInt(l.cgNum) : 0);
             lkNum += (l.lkNum ? parseInt(l.lkNum) : 0);
-            if (!l.supId) {
+            if (!l.supId && cgNum > 0) {
+                // 采购的才需要选择供应商
                 return layer.msg('序号为' + (i + 1) + '的数据，未选择供应商', { icon: 7 });
             }
             if (!l.ccDay) {

js/aq_demand_plan/child/send_out_unplanned_form.js

@@ -157,7 +157,7 @@ function beforeSubmitApply() {
             let l = list[j];
             cgNum += (l.cgNum ? parseInt(l.cgNum) : 0);
             lkNum += (l.lkNum ? parseInt(l.lkNum) : 0);
-            if (!l.supId) {
+            if (!l.supId && cgNum > 0) {
                 return layer.msg('序号为' + (i + 1) + '的数据，未选择供应商', { icon: 7 });
             }
         }

page/aq_demand_plan/child/send_out_detail.html

@@ -27,7 +27,7 @@
 
     #detail-box img {
         width: 50px;
-        height: 50pz;
+        height: 50px;
     }
 </style>
 
@@ -173,6 +173,35 @@
                 </div>
             </div>
         </div>
+        <!-- 签字区域 -->
+        <div id="signature-box">
+            <div class="title layout">
+                <span style="font-weight:700;text-decoration:none;color:#409EFF;">▋</span>
+                <p>签字确认</p>
+            </div>
+            <div id="signature-table-box">
+                <table class="classTable signature-table">
+                    <tr>
+                        <td style="width: 25%; text-align: center; height: 80px;">
+                            <div style="margin-bottom: 10px; font-weight: bold;">领料人</div>
+                            <div style="border-bottom: 1px solid #000; height: 30px; margin: 0 10px;"></div>
+                        </td>
+                        <td style="width: 25%; text-align: center; height: 80px;">
+                            <div style="margin-bottom: 10px; font-weight: bold;">制单人</div>
+                            <div style="border-bottom: 1px solid #000; height: 30px; margin: 0 10px;"></div>
+                        </td>
+                        <td style="width: 25%; text-align: center; height: 80px;">
+                            <div style="margin-bottom: 10px; font-weight: bold;">审核人</div>
+                            <div style="border-bottom: 1px solid #000; height: 30px; margin: 0 10px;"></div>
+                        </td>
+                        <td style="width: 25%; text-align: center; height: 80px;">
+                            <div style="margin-bottom: 10px; font-weight: bold;">出库人</div>
+                            <div style="border-bottom: 1px solid #000; height: 30px; margin: 0 10px;"></div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
     </div>
 </body>
 <script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>