diff --git a/home_dir/www/ksvc/inc/css/scss/component/_form.scss b/home_dir/www/ksvc/inc/css/scss/component/_form.scss index a0e9789..4c8e1b0 100644 --- a/home_dir/www/ksvc/inc/css/scss/component/_form.scss +++ b/home_dir/www/ksvc/inc/css/scss/component/_form.scss @@ -1,3 +1,5 @@ +// 원기씨 바보바봅 + form { height: 100%; diff --git a/home_dir/www/ksvc/site/sts_order_prod/popComponent/isNoRun.php b/home_dir/www/ksvc/site/sts_order_prod/popComponent/isNoRun.php index 935ad60..7d1dc44 100644 --- a/home_dir/www/ksvc/site/sts_order_prod/popComponent/isNoRun.php +++ b/home_dir/www/ksvc/site/sts_order_prod/popComponent/isNoRun.php @@ -16,7 +16,7 @@
- + diff --git a/home_dir/www/ksvc/site/sts_order_prod/popComponent/isRun.php b/home_dir/www/ksvc/site/sts_order_prod/popComponent/isRun.php index cbdefd6..0db52a0 100644 --- a/home_dir/www/ksvc/site/sts_order_prod/popComponent/isRun.php +++ b/home_dir/www/ksvc/site/sts_order_prod/popComponent/isRun.php @@ -12,7 +12,7 @@
- +
diff --git a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js index 17e55d1..3eb1418 100644 --- a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js +++ b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js @@ -54,13 +54,15 @@ class SimpleTable { mode : this.putMode } - if(addData){ - postData['reqdata'] = JSON.stringify([{ ...this.formData, ...addData}]); + // if(addData){ + // postData['reqdata'] = JSON.stringify([{ ...this.formData, ...addData}]); - }else if(updateData){ - postData['reqdata'] = JSON.stringify([{ FACLT_OPER_NO : this.addCode, ...updateData}]); + // }else if(updateData){ + // postData['reqdata'] = JSON.stringify([{ FACLT_OPER_NO : this.addCode, ...updateData}]); - } + // } + const tableData = this.tbList.getData().filter(row=>row._STATUS_)[0]; + postData['reqdata'] = JSON.stringify([{...tableData, ...this.formData, FACLT_OPER_NO : this.addCode}]) console.log(this.addCode) @@ -86,6 +88,13 @@ class SimpleTable { } + updateData(updateData){ + if(updateData){ + this.tbList.getRowFromPosition(this.tbList.getData().length).update({ FACLT_OPER_NO: this.addCode, ...updateData }); + console.log(updateData) + }; + } + init(addData, updateData, btn){ const commonFieldData = { @@ -108,10 +117,10 @@ class SimpleTable { this.tbList.on("tableBuilt", () => { this.getMainList().then(()=>{ if(addData){ - this.tbList.addRow({...addData}); + this.tbList.addRow({...addData, _STATUS_: 'I'}); }; if(updateData){ - this.tbList.getRowFromPosition(this.tbList.getData().length).update({ FACLT_OPER_NO: this.addCode, ...updateData }); + this.tbList.getRowFromPosition(this.tbList.getData().length).update({ FACLT_OPER_NO: this.addCode, ...updateData, _STATUS_: 'U' }); console.log(updateData) }; }) @@ -157,6 +166,8 @@ class FieldPop { table : {}, + callBack : function(){}, + isComponent : { isDefHst : false, isWorker : false, @@ -376,9 +387,16 @@ class FieldPop { WO_NO: this.formData.WO_NO, RUNSTOP_GB: 'R', OPER_ST_TM : this.dateTime, - _STATUS_ : 'I' },false,'isRun'); + this.callBack = ()=>{ + this.table.updateData({ + WO_NO: this.formData.WO_NO, + RUNSTOP_GB: 'R', + OPER_ST_TM : this.dateTime, + }) + } + break; case 'isNoRun': @@ -390,14 +408,20 @@ class FieldPop { this.getMode = 'getRunInfo'; this.putMode = 'putRunInfo'; + this.callTable(com, false, { STOP_CD: this.STOP_CD_val, RUNSTOP_GB: 'S', OPER_ED_TM : this.dateTime, - _STATUS_ : 'U' }, 'isNoRun'); - console.log(this.STOP_CD) + this.callBack = ()=>{ + this.table.updateData({ + STOP_CD: this.STOP_CD_val, + RUNSTOP_GB: 'S', + OPER_ED_TM : this.dateTime, + }) + }; break; case 'isDefHst':