From 539b002f8e71c91e2659081bf3485f0e80e65b44 Mon Sep 17 00:00:00 2001 From: jiang Date: Fri, 18 Jul 2025 15:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=8A=E8=BD=A6=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/init.json | 51 ------------------- js/aq_demand_plan/child/send_out_detail.js | 18 +++++-- js/aq_demand_plan/child/send_out_form.js | 6 +-- .../child/send_out_unplanned_form.js | 4 +- page/aq_demand_plan/child/send_out_form.html | 4 +- .../child/send_out_unplanned_form.html | 8 +-- 6 files changed, 26 insertions(+), 65 deletions(-) diff --git a/api/init.json b/api/init.json index ac0be60..04ca8dc 100644 --- a/api/init.json +++ b/api/init.json @@ -144,57 +144,6 @@ "target": "_self" } ] - },{ - "title": "车辆需求计划管理", - "href": "", - "icon": "fa fa-cog", - "target": "_self", - "child": [ - { - "title": "用车计划申请", - "href": "page/car_demand_plan/apply_plan_list.html", - "icon": "fa fa-asterisk", - "target": "_self" - }, - { - "title": "用车计划审核", - "href": "page/car_demand_plan/apply_plan_audit_list.html", - "icon": "fa fa-asterisk", - "target": "_self" - }, - { - "title": "紧急及内部用车", - "href": "page/car_demand_plan/emerg_internal_car_list.html", - "icon": "fa fa-asterisk", - "target": "_self" - } - ] - }, - { - "title": "工器具需求计划", - "href": "", - "icon": "fa fa-home", - "target": "_self", - "child": [ - { - "title": "工器具计划申请", - "href": "page/demandPlan/apply_plan_list.html", - "icon": "fa fa-tachometer", - "target": "_self" - }, - { - "title": "工器具计划审核", - "href": "page/demandPlan/plan_check_list.html", - "icon": "fa fa-tachometer", - "target": "_self" - }, - { - "title": "工器具发货统计", - "href": "page/demandPlan/delivery_list.html", - "icon": "fa fa-tachometer", - "target": "_self" - } - ] } ] } diff --git a/js/aq_demand_plan/child/send_out_detail.js b/js/aq_demand_plan/child/send_out_detail.js index f5d3a68..35d79cf 100644 --- a/js/aq_demand_plan/child/send_out_detail.js +++ b/js/aq_demand_plan/child/send_out_detail.js @@ -5,7 +5,7 @@ let pageNum = 1; function setParams(params) { objParam = JSON.parse(params); console.error(objParam); - + $('#code').html(objParam.planCode); $('#titleName').html(objParam.proName); layui.use(["form", "table", 'upload', 'layer'], function () { @@ -218,8 +218,17 @@ function exportExcel() { exportExcelUtil(url, '采购发货明细', JSON.stringify(params)); } +/* // 打印 function print() { + + // 打印前追加新的内容到 #table-box 内 + const newElement = document.createElement('div'); + newElement.innerHTML = '

新增内容：这是打印前加上的内容！

'; + + // 将新的内容插入到 #table-box 内部 + document.querySelector('#table-box').appendChild(newElement); + Print('#table-box', { onStart: function () { console.log('onStart', new Date()) @@ -229,6 +238,7 @@ function print() { } }) } +*/ // 预览文件 function viewFile(obj) { @@ -265,12 +275,12 @@ function print() { $("#main-box").print({ globalStyles: true, mediaPrint: false, - stylesheet: '../../../css/aq_demand_plan/apply_plan_detail.css', + stylesheet: '../../../../css/aq_demand_plan/send_out_detail.css', noPrintSelector: ".no-print", iframe: true, append: null, - prepend: null, + prepend: null, // 添加到打印内容的开头 manuallyCopyFormValues: true, deferred: $.Deferred() }); -} \ No newline at end of file +} diff --git a/js/aq_demand_plan/child/send_out_form.js b/js/aq_demand_plan/child/send_out_form.js index 1f53398..9582a3f 100644 --- a/js/aq_demand_plan/child/send_out_form.js +++ b/js/aq_demand_plan/child/send_out_form.js @@ -139,9 +139,9 @@ function saveData2() { // 提交前确认 function beforeSubmitApply() { // 校验发货附件是否上传 - if (fileList.length === 0) { + /* if (fileList.length === 0) { return layer.msg('请上传发货附件', { icon: 7 }); - } + }*/ let dataList = getBaseTableData(); // 校验 发货明细数据 for (let i = 0; i < dataList.length; i++) { @@ -350,4 +350,4 @@ function closePage(data) { frameId.contentWindow.sendOutSuccess(JSON.stringify(obj)); } parent.layer.close(index); // 再执行关闭 -} \ No newline at end of file +} diff --git a/js/aq_demand_plan/child/send_out_unplanned_form.js b/js/aq_demand_plan/child/send_out_unplanned_form.js index 3fa1926..1c71b9e 100644 --- a/js/aq_demand_plan/child/send_out_unplanned_form.js +++ b/js/aq_demand_plan/child/send_out_unplanned_form.js @@ -144,9 +144,9 @@ function saveData2() { // 提交前确认 function beforeSubmitApply() { // 校验发货附件是否上传 - if (fileList.length === 0) { + /* if (fileList.length === 0) { return layer.msg('请上传发货附件', { icon: 7 }); - } + }*/ let dataList = getBaseTableData(); // 校验 发货明细数据 for (let i = 0; i < dataList.length; i++) { diff --git a/page/aq_demand_plan/child/send_out_form.html b/page/aq_demand_plan/child/send_out_form.html index 558e1ab..c3d48ba 100644 --- a/page/aq_demand_plan/child/send_out_form.html +++ b/page/aq_demand_plan/child/send_out_form.html @@ -72,7 +72,7 @@
-

发货附件*

+

发货附件

@@ -172,4 +172,4 @@ - \ No newline at end of file + diff --git a/page/aq_demand_plan/child/send_out_unplanned_form.html b/page/aq_demand_plan/child/send_out_unplanned_form.html index d5d828a..948f60e 100644 --- a/page/aq_demand_plan/child/send_out_unplanned_form.html +++ b/page/aq_demand_plan/child/send_out_unplanned_form.html @@ -54,10 +54,12 @@
- +
+ class="layui-textarea" lay-verify="required" maxLength="255" + lay-affix="clear">