diff --git a/static/modules/finance.js b/static/modules/finance.js index f52f685..d705221 100644 --- a/static/modules/finance.js +++ b/static/modules/finance.js @@ -116,7 +116,7 @@ function renderFinance() { const finHeaderBase = `视图:${toolDateSelect}`; const finAddBtn = ``; - const finFilterTabs = `
`; + const finFilterTabs = `
`; document.querySelector("#finance").innerHTML = `
${finFilterTabs} @@ -142,7 +142,7 @@ function renderFinance() {
- +
@@ -245,7 +245,7 @@ function renderFinance() { setTimeout(() => renderExpense(), 10); return `
`; } - const isUnsigned = state.finFilter === '待签约'; + const isUnsigned = false; const METRIC_CARDS = [ { label: '签约金额', value: ctx => moneyWan(ctx.signTotal), color: 'text-slate-700' }, { label: '已确收', hideUnsigned: true, value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' }, @@ -324,7 +324,7 @@ function renderFinance() { const payR = payRVal !== null ? '' + payRVal + '%' : ''; const paidR = cost && paid ? Math.round(paid / cost * 100) + '%' : ''; const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : ''; - const st = pf.status === '已签约' ? '已签约' : '待签约'; + const st = '已签约'; const cf = cashflow ? money(cashflow) : ''; const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600'; const profit = gross; @@ -334,7 +334,7 @@ function renderFinance() { }; // 待签约简版行 const tdRowUnsigned = (pf, cost, gross) => { - const st = pf.status === '待签约' ? '待签约' : '已签约'; + const st = '已签约'; const profit = gross; const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600'; const pfVal = profit ? money(profit) : ''; @@ -789,7 +789,7 @@ window.openPfEditModal = (pfId) => { signMonthEl.innerHTML = monthOptions(signMonthValue); signMonthEl.value = signMonthValue; } - form.querySelector('[name="status"]').value = pf.status || "待签约"; + form.querySelector('[name="status"]').value = pf.status || "已签约"; form.querySelector('[name="sales_person"]').value = pf.sales_person || ""; form.querySelector('[name="owner"]').value = pf.owner || ""; setVal("start_date", pf.start_date); diff --git a/static/modules/plan.js b/static/modules/plan.js index d5fa86a..66080d0 100644 --- a/static/modules/plan.js +++ b/static/modules/plan.js @@ -114,7 +114,7 @@ function renderPlan() { const finHeaderBase = `视图:${toolDateSelect}`; const finAddBtn = ``; - const planFilterTabs = `
`; + const planFilterTabs = `
`; document.querySelector("#plan").innerHTML = `
${planFilterTabs} @@ -140,7 +140,7 @@ function renderPlan() {
- +
@@ -336,7 +336,7 @@ function renderPlan() { const payR = payRVal !== null ? '' + payRVal + '%' : ''; const paidR = cost && paid ? Math.round(paid / cost * 100) + '%' : ''; const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : ''; - const st = pf.status === '已签约' ? '已签约' : '待签约'; + const st = '待签约'; const cf = cashflow ? money(cashflow) : ''; const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600'; const profit = gross; @@ -346,7 +346,7 @@ function renderPlan() { }; // 待签约简版行 const tdRowUnsigned = (pf, cost, gross) => { - const st = pf.status === '待签约' ? '待签约' : '已签约'; + const st = '待签约'; const profit = gross; const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600'; const pfVal = profit ? money(profit) : ''; diff --git a/static/modules/utils.js b/static/modules/utils.js index 4f9d9d7..f9bfa39 100644 --- a/static/modules/utils.js +++ b/static/modules/utils.js @@ -11,7 +11,7 @@ const state = { taskView: localStorage.getItem("opc-task-view") || "detail", finView: "overview", finSort: null, // { key: 'col', asc: true } - planFilter: "已签约", + planFilter: "待签约", planView: "overview", planSort: null, proposalTab: "standard", diff --git a/templates/index.html b/templates/index.html index 00770d4..e127cd6 100644 --- a/templates/index.html +++ b/templates/index.html @@ -80,7 +80,7 @@
-

OPC Manager v1.0.0.17

+

OPC Manager v1.0.0.18

科普 OPC 工作台