diff --git a/index.html b/index.html index e4e6494..d36954f 100644 --- a/index.html +++ b/index.html @@ -171,8 +171,8 @@ }, null); } else { console.log('走的自己登录'); - //login(miniAdmin); - window.location = 'page/welcome-1.html'; + login(miniAdmin); + // window.location = 'page/welcome-1.html'; } /* var options = { iniUrl: "api/init.json", // 初始化接口 diff --git a/js/aq_demand_plan/child/send_out_detail.js b/js/aq_demand_plan/child/send_out_detail.js index 187e073..f5d3a68 100644 --- a/js/aq_demand_plan/child/send_out_detail.js +++ b/js/aq_demand_plan/child/send_out_detail.js @@ -6,8 +6,8 @@ function setParams(params) { objParam = JSON.parse(params); console.error(objParam); - $('#code').html(objParam.code); - $('#titleName').html('220kV奎福变电站工程'); + $('#code').html(objParam.planCode); + $('#titleName').html(objParam.proName); layui.use(["form", "table", 'upload', 'layer'], function () { form = layui.form; table = layui.table; @@ -40,7 +40,7 @@ function getPurchaseDetails() { function setTableData(obj) { $('#planCode').html(obj.planCode); $('#cgNum').html(obj.cgNum); - $('#money').html(obj.money); + $('#money').html('¥ ' + obj.money); $('#lkNum').html(obj.lkNum); $('#fhDay').html(obj.fhDay); $('#jbUser').html(obj.jbUser); diff --git a/js/aq_demand_plan/child/send_out_pro_detail.js b/js/aq_demand_plan/child/send_out_pro_detail.js index 14f12b5..72f5cb6 100644 --- a/js/aq_demand_plan/child/send_out_pro_detail.js +++ b/js/aq_demand_plan/child/send_out_pro_detail.js @@ -301,6 +301,7 @@ function sendOutSuccess(data) { // 详情 function sendOutDetail(obj) { + obj.proName = objParam.proName; openIframeByParamObj2("sendOutDetail", "详情", "../aq_demand_plan/child/send_out_detail.html", "92%", "95%", obj); } diff --git a/js/aq_settlement/payment_list.js b/js/aq_settlement/payment_list.js index 1ec8486..b7c1ead 100644 --- a/js/aq_settlement/payment_list.js +++ b/js/aq_settlement/payment_list.js @@ -123,7 +123,7 @@ function initTable() { }, { field: "jhNum", - width: '10%', + width: '12%', title: "需求计划编号数量", unresize: true, align: "center", @@ -131,7 +131,7 @@ function initTable() { }, { field: "proNum", - width: '10%', + width: '8%', title: "工程数量", unresize: true, align: "center", diff --git a/page/aq_settlement/payment_list.html b/page/aq_settlement/payment_list.html index f8877a1..cec3e86 100644 --- a/page/aq_settlement/payment_list.html +++ b/page/aq_settlement/payment_list.html @@ -23,7 +23,7 @@