Commit e8e72a40 authored by Riri Novita's avatar Riri Novita

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 89aeefde 7fef07b6
...@@ -2575,7 +2575,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2575,7 +2575,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleForecast(tableMeta, `${Number(this.props.periode) + 1}`)).toFixed(1)} value={Number(handleForecast(tableMeta, `${Number(this.props.periode) + 2}`)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
......
This diff is collapsed.
...@@ -576,14 +576,14 @@ export default class BalanceSheetMR extends Component { ...@@ -576,14 +576,14 @@ export default class BalanceSheetMR extends Component {
// // console.log(i); // // console.log(i);
// err = true // err = true
// } else // } else
if ( i[18] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) { if ( i[18] === "" && (Number(i[14]).toFixed(1) < this.state.minValue || Number(i[14]).toFixed(1) > this.state.maxValue)) {
console.log('msk 2'); console.log('msk 2');
err = true err = true
} }
} }
if (String(i[5]) == "Control (should be nil)") { if (String(i[5]) == "Control (should be nil)") {
if (Number(i[9]) < this.state.minValue || Number(i[9]) > this.state.maxValue ) { if (Number(i[9]).toFixed(1) < this.state.minValue || Number(i[9]).toFixed(1) > this.state.maxValue ) {
errorContrl = true errorContrl = true
editAble = true editAble = true
} }
......
...@@ -212,6 +212,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -212,6 +212,7 @@ export default class CorporateAnnualTargetMR extends Component {
if (indexIDzz === -1) { if (indexIDzz === -1) {
let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE' let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
let weight = String(item.weight).substr(0, String(item.weight).length - 1) let weight = String(item.weight).substr(0, String(item.weight).length - 1)
let weightTB = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
// console.log(weight) // console.log(weight)
dataTable.push([ dataTable.push([
item.type_report_id, item.type_report_id,
...@@ -221,7 +222,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -221,7 +222,7 @@ export default class CorporateAnnualTargetMR extends Component {
item.level, item.level,
item.description, item.description,
// item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1), // item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
parentTrue ? weight : item.corporate_annual_target.weight, parentTrue ? weight : weightTB,
parentTrue ? item.corporate_annual_target.uom : item.uom, parentTrue ? item.corporate_annual_target.uom : item.uom,
parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type, parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type,
// parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type }, // parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },
...@@ -330,8 +331,9 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -330,8 +331,9 @@ export default class CorporateAnnualTargetMR extends Component {
} }
downloadTemplate = async () => { downloadTemplate = async () => {
console.log(`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&${this.props.periode}`)
let res = await fetch( let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=2021` `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&${this.props.periode}`
) )
console.log(res); console.log(res);
res = await res.blob() res = await res.blob()
...@@ -417,7 +419,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -417,7 +419,7 @@ export default class CorporateAnnualTargetMR extends Component {
item.formula, item.formula,
item.level, item.level,
item.item_report, item.item_report,
String(item.weight).includes("%") ? String(item.weight).substr(0, String(item.weight).length - 1) : item.weight, String(item.weight).includes("%") ? String(item.weight).trim().substr(0, String(item.weight).trim().length - 1) : item.weight,
item.uom, item.uom,
item.jenis_kpi, item.jenis_kpi,
item.max_ach, item.max_ach,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment