From 8e7b0fce2ecc9dda6f9045373edb0bd220357e1b Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 17 Jan 2025 13:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/car_demand_plan/arrival_confirm_list.js | 17 +++++++----------
.../child/branch_settlement_detail.js | 16 ++++++++--------
js/welcome/data_detail_common.js | 6 +++---
.../child/branch_settlement_detail.html | 4 ++--
4 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/js/car_demand_plan/arrival_confirm_list.js b/js/car_demand_plan/arrival_confirm_list.js
index 3fe1911..b49effe 100644
--- a/js/car_demand_plan/arrival_confirm_list.js
+++ b/js/car_demand_plan/arrival_confirm_list.js
@@ -139,7 +139,7 @@ function initTable() {
unresize: true,
align: "center",
templet: function (d) {
- return ' ● 已派车';
+ return ' ● 已派车';
},
},
{
@@ -196,22 +196,19 @@ function exportExcel() {
'keyWord': $('#keyWord').val(),
applyType: '1'
}
- let url = dataUrl + "backstage/carNeedPlan/export";
- exportExcelUtil(url, '车辆需求计划', JSON.stringify(params));
+ let url = dataUrl + "backstage/supDispatchCar/expOutPageList";
+ exportExcelUtil(url, '到货确认单', JSON.stringify(params));
}
//审核状态
function setIsUpload(value) {
- /* if (value.indexOf('审核通过') > -1) {
- return "●" + auditStatus + "";
- } else if (value.indexOf('审核驳回') > -1) {
- return "●" + auditStatus + "";
+ if (value > 0) {
+ return "●已上传";
} else {
- return "●" + auditStatus + "";
- } */
- return "●待上传";
+ return "●待上传";
+ }
}
// 需求计划详情
diff --git a/js/car_settlement/child/branch_settlement_detail.js b/js/car_settlement/child/branch_settlement_detail.js
index b0d1d1f..15229f2 100644
--- a/js/car_settlement/child/branch_settlement_detail.js
+++ b/js/car_settlement/child/branch_settlement_detail.js
@@ -31,15 +31,15 @@ function setDataView() {
// 查询/重置
function queryTable(type) {
if (type === 1) {
- let code = $('#code').val();
- let flag = checkValue(code);
+ let proName = $('#proName').val();
+ let flag = checkValue(proName);
if (flag) {
- $('#code').val('');
- return layer.msg('需求计划编号查询包含特殊字符，请重新输入', { icon: 2 });
+ $('#proName').val('');
+ return layer.msg('工程名称查询包含特殊字符，请重新输入', { icon: 2 });
}
reloadTable(1);
} else if (type === 2) {
- $('#code').val('');
+ $('#proName').val('');
$('#status').val('');
layui.form.render();
reloadTable(1);
@@ -59,7 +59,7 @@ function reloadTable(pageNum) {
},
where: {
encryptedData: JSON.stringify({
- 'code': $('#code').val(),
+ 'proName': $('#proName').val(),
'status': $('#status').val(),
'bmname': objParam.bmname
}),
@@ -80,7 +80,7 @@ function initTable() {
url: dataUrl + "backstage/carStatistics/getSltPageListByBmName",
where: {
encryptedData: JSON.stringify({
- 'code': $('#code').val(),
+ 'proName': $('#proName').val(),
'status': $('#status').val(),
'bmname': objParam.bmname
}),
@@ -202,7 +202,7 @@ function initTable() {
// 导出
function exportExcel() {
let params = {
- 'code': $('#code').val(),
+ 'proName': $('#proName').val(),
'status': $('#status').val(),
'bmname': objParam.bmname
}
diff --git a/js/welcome/data_detail_common.js b/js/welcome/data_detail_common.js
index 0d7c807..8e56bcf 100644
--- a/js/welcome/data_detail_common.js
+++ b/js/welcome/data_detail_common.js
@@ -43,9 +43,9 @@ function loadYearsData() {
// 月份
function loadMonthData() {
- const list = [{ id: 'month-1', labelName: '1月' }, { id: 'month-2', labelName: '2月' }, { id: 'month-3', labelName: '3月' }, { id: 'month-4', labelName: '4月' },
- { id: 'month-5', labelName: '5月' }, { id: 'month-6', labelName: '6月' }, { id: 'month-7', labelName: '7月' }, { id: 'month-8', labelName: '8月' },
- { id: 'month-9', labelName: '9月' }, { id: 'month-10', labelName: '10月' }, { id: 'month-11', labelName: '11月' }, { id: 'month-12', labelName: '12月' }];
+ const list = [{ id: 'month-01', labelName: '1月' }, { id: 'month-02', labelName: '2月' }, { id: 'month-03', labelName: '3月' }, { id: 'month-04', labelName: '4月' },
+ { id: 'month-05', labelName: '5月' }, { id: 'month-06', labelName: '6月' }, { id: 'month-07', labelName: '7月' }, { id: 'month-08', labelName: '8月' },
+ { id: 'month-09', labelName: '9月' }, { id: 'month-10', labelName: '10月' }, { id: 'month-11', labelName: '11月' }, { id: 'month-12', labelName: '12月' }];
setTagData(list, 'demo4');
}
diff --git a/page/car_settlement/child/branch_settlement_detail.html b/page/car_settlement/child/branch_settlement_detail.html
index 855b9a0..a47cee3 100644
--- a/page/car_settlement/child/branch_settlement_detail.html
+++ b/page/car_settlement/child/branch_settlement_detail.html
@@ -58,8 +58,8 @@