From 55066454b1b99cbd61f83025cdad6d9047e12e45 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Mon, 12 Jan 2026 13:38:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E7=89=88=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4=E5=88=B7=E6=96=B0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=A1=B5=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/car_demand_plan/apply_plan_audit_list.js | 8 +++++--- js/car_demand_plan/apply_plan_list.js | 10 +++++----- js/car_demand_plan/arrival_confirm_list.js | 14 +++++++------- js/car_demand_plan/child/apply_plan_edit_form.js | 9 ++++----- js/car_demand_plan/child/arrival_confirm_form.js | 6 +++--- js/car_demand_plan/child/dispatch_car_detail.js | 4 ++-- js/openIframe.js | 4 ++-- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/js/car_demand_plan/apply_plan_audit_list.js b/js/car_demand_plan/apply_plan_audit_list.js index c6f2452..6660bbe 100644 --- a/js/car_demand_plan/apply_plan_audit_list.js +++ b/js/car_demand_plan/apply_plan_audit_list.js @@ -90,6 +90,7 @@ function initTable() { { width: '6.9%', title: "序号", + type: 'numbers', align: "center", templet: function (d) { return d.LAY_NUM; @@ -105,7 +106,7 @@ function initTable() { }, { field: "proName", - width: '14%', + width: '24%', title: "工程名称", unresize: true, align: "center", @@ -132,8 +133,8 @@ function initTable() { }, }, { - field: "userName", - width: '10%', + field: "nickName", + width: '8%', title: "提交人", unresize: true, align: "center", @@ -170,6 +171,7 @@ function initTable() { title: "操作", width: '10%', align: "center", + fixed: 'right', unresize: true, templet: function (d) { let html = ""; diff --git a/js/car_demand_plan/apply_plan_list.js b/js/car_demand_plan/apply_plan_list.js index f4a33ce..ea7a5e8 100644 --- a/js/car_demand_plan/apply_plan_list.js +++ b/js/car_demand_plan/apply_plan_list.js @@ -105,7 +105,7 @@ function initTable() { }, { field: "proName", - width: '15%', + width: '20%', title: "工程名称", unresize: true, align: "center", @@ -120,8 +120,8 @@ function initTable() { sort:true, }, { - field: "userName", - width: '10%', + field: "nickName", + width: '8%', title: "申请人", unresize: true, align: "center", @@ -129,7 +129,7 @@ function initTable() { }, { field: "appLyTime", - width: '15%', + width: '10%', title: "申请时间", unresize: true, align: "center", @@ -137,7 +137,7 @@ function initTable() { }, { field: "remark", - width: '14%', + width: '16%', title: "备注", unresize: true, sort:true, diff --git a/js/car_demand_plan/arrival_confirm_list.js b/js/car_demand_plan/arrival_confirm_list.js index 2e580d0..1b7bb34 100644 --- a/js/car_demand_plan/arrival_confirm_list.js +++ b/js/car_demand_plan/arrival_confirm_list.js @@ -341,15 +341,15 @@ function examine(item) { { title: '审核操作', move: false, - btn: ['不通过', '通过'] // 按钮顺序：左 -> 不通过，右 -> 通过 + btn: ['通过', '不通过'] // 按钮顺序：左 -> 不通过，右 -> 通过 }, function () { - // 点击 "不通过" 的回调函数（左侧按钮） - submitExamineStatus(item, 2); - }, - function () { - // 点击 "通过" 的回调函数（右侧按钮） + // 点击 "通过" 的回调函数（左侧按钮） submitExamineStatus(item, 1); + }, + function () { + // 点击 "不通过" 的回调函数（右侧按钮） + submitExamineStatus(item, 2); } ); } @@ -372,7 +372,7 @@ function submitExamineStatus(item, status) { layer.close(loadingMsg); // 关闭提示层 if (result.code === 200) { layer.msg(result.msg, { icon: 1 }); - initTable(); + //initTable(); } else { layer.msg(result.msg, { icon: 2 }); } diff --git a/js/car_demand_plan/child/apply_plan_edit_form.js b/js/car_demand_plan/child/apply_plan_edit_form.js index a79310b..f884108 100644 --- a/js/car_demand_plan/child/apply_plan_edit_form.js +++ b/js/car_demand_plan/child/apply_plan_edit_form.js @@ -349,14 +349,13 @@ function addFitDatas(data) { function setTableData(results) { $('#allCheck').prop('checked', false) delIdArr.splice(0, delIdArr.length); - var html = ""; + let html = ""; if (results && results.length > 0) { - for (var i = 0; i < results.length; i++) { - var l = results[i]; + for (let i = 0; i < results.length; i++) { + let l = results[i]; html += ""; html += ''; - html += "" - + (i + 1) + ""; + html += "" + (i + 1) + ""; html += "" + (l.type) + ""; html += "" + l.name + ""; html += "" + l.model + ""; diff --git a/js/car_demand_plan/child/arrival_confirm_form.js b/js/car_demand_plan/child/arrival_confirm_form.js index d4ff18d..5d69b4a 100644 --- a/js/car_demand_plan/child/arrival_confirm_form.js +++ b/js/car_demand_plan/child/arrival_confirm_form.js @@ -140,8 +140,8 @@ function submitApply() { // 关闭页面 function closePage(type) { let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引 - if (type == 1) { - window.parent.reloadData(); - } + // if (type == 1) { + // window.parent.reloadData(); + // } parent.layer.close(index); // 再执行关闭 } \ No newline at end of file diff --git a/js/car_demand_plan/child/dispatch_car_detail.js b/js/car_demand_plan/child/dispatch_car_detail.js index ea15fd2..b4bf619 100644 --- a/js/car_demand_plan/child/dispatch_car_detail.js +++ b/js/car_demand_plan/child/dispatch_car_detail.js @@ -297,8 +297,8 @@ function getDispatchCarData(id) { "" + item.startAddress + "" + "" + item.endAddress + "" + "" + item.gls + "" + - "" + item.glsPrice.toFixed(2) + "" + - " ¥ " + (item.glsMoney ? item.glsMoney.toFixed(2) : 0) + "" + + "" + item.glsPrice + "" + + " ¥ " + item.glsMoney + "" + "" + imgNum + "查看附件>>" + "" + objParam.supName + "" + ""; diff --git a/js/openIframe.js b/js/openIframe.js index df64d60..2652209 100644 --- a/js/openIframe.js +++ b/js/openIframe.js @@ -56,10 +56,10 @@ function openIframeByParamObj(id, title, content, width, height, paramsObj, isCa cancel: function () { if (isCancel) { // 采购发货刷新一级页面 - reloadData(); + //reloadData(); } if (id==='arrivalConfirmDetail'){ - initTable(); + //initTable(); } }, end: function () { }