From b6472c4649a3ab83074f6beaac38fe3c276bd07c Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Wed, 7 Aug 2024 16:25:31 +0800 Subject: [PATCH] '111' --- .idea/workspace.xml | 184 +++++------------- .../authorize/AuthorizeController.class | Bin 15866 -> 15878 bytes .../web/controller/zgys/ZgysController.class | Bin 14117 -> 14124 bytes .../com/ruoyi/authorize/domain/Authorize.java | 7 + .../mapper/authorize/AuthorizeMapper.xml | 124 ++++++------ .../ruoyi/authorize/domain/Authorize.class | Bin 8205 -> 8438 bytes .../mapper/authorize/AuthorizeMapper.xml | 120 ++++++------ .../src/views/authorize/authorize/index.vue | 28 +-- 8 files changed, 200 insertions(+), 263 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b6b4a62..823247e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,101 +2,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + @@ -196,11 +109,11 @@ - - + + - + @@ -210,70 +123,71 @@ - - + + - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -282,10 +196,10 @@ - + - + @@ -294,16 +208,20 @@ - + - - - + + + - + + + + + diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class index bedec5854d30025dfe8db994990125488b549e50..d36ab83502225160984240e6a381838f29bab589 100644 GIT binary patch delta 5584 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 delta 5571 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 kX)oqiRUiGj}$3&%J+c_=Tg7JprJz zIo*$&B-f7>(jk#e$0X?_C+KIMC7mtF_roV$Y&lW;t~%IF2MhetU3zHK(+^8}+0t9b z`shbrTl)E>zYMTtpe=*^cwGi-Geq}4NoNdA3d=AV?w3Lt;m2z-QkA20cyyACks?3# z%2?Hn)8=G7aJ)*V=ou5VDOTM?ZA$zyNha&)6u(TBX||lI6Q-+XhE6E8Wu|_dX3H$? zXIpZ*9hNh6Y>p*o`q5Q#b;(>y&hn$XA*HZfq~gV@T&B_`DqX75WhyOK>2j5>u;fZV ziq%EMa+NJtYk!T}>e?i^POeYFA98~>kt7_D8?{-XQ*N^5W?g@aBE40mmA2fb{VHBI zEVt_kcW85`Evs!=qvBfi#$C3ov*m7E?y+UPEgRG}_a@1GvQhWF-C= zJgcA2`Q>@pVarZSc3JX5`9?F>=XueRm&%(belDJuEqNt!r_;1NJ;@U5RZCtIw2q`D zHjWfI2gJjn=H;{NjP*2MgSC#l&IUK*7E9i6HM~-|fpE&ZVeCEjK@`b=tJa|HpBVWoMN4`=;Lcfy+ zSn{kzZ5#6%`jxh|9%81`nU$$T#w>Bj3sQ4sORCj{G2>S+d`eALS=Yes<&+ z`Bmrq7Ix%!`NF}SSZ&E4jvSDKj{K>IAEH_gYjZ?DkE&E<;26=ym;}dojMp+g$5_U8 zOd?M(e#ay!Dk*l1L&TZ^%Or>*VjJz^l6KxMY<%X`5NF!LCZ)3UuxZ= z#bqO>6`!`a%rOCz99f#28E$A&1P%7A+Ay;3mlY3uS#kBA2X5h)V^U2c$22xU$23u? zsR>%9nPZw0u4%z@O-q&1v}vWEtyOBHQd^bUsnlMjbd@qx%2X*!rI1S5lp2^E6?0YD zL2?3j-Fk#ruhPB>@rpxJXu9n*<3aT``y<^;#&na+;MH(eZaqUq|GZuEsI zFx?%~Lq4N9vK`Y?H|}M6JEo86OI1h5^ix%TGr%zeRT`vI+wFa1*;lK#?OVHS&!#mw z`|d5@bK4z}PZ~D12P>u_=A=kf!+G_Gnqih1uJ-3Sh4MutoYHvY2*->xqqubk$BZ^( z98+Y*3VatY-@T_ms_Ky(994};uwX|66Mz79yieb~tL z^@w@{?&ls4aEgVb&=!xlWG!bC_J$|*gJNAze;TFIll?9;L$ueWdO zVhB(Lj6xDdBNb!N5=AbK&asI#IMNWsquh*(T||Z}Qd~p{T<1pxD!G$lOXXp)u}!>7 zZ0s?P9fxu&Qnqow7|h2hJ%J}V|E|d8>1k7sS+m4NqkDokj#*Qsr?8!Cj@$F;S~q_N z&vJ=FPU1N|r;JMk&tr#sNMgnoSr^%w(Lb!t>P6#@LppY17lEFE26zE4x&~NXbL8r{ zBT{h%UgF^fJum|=;}!1rD)$J$dl-2ZUQ6gBhcU>)>y`^Io8xiEyn#2l>04!Z8}F3i zUA#w3o$!7cKEUoWe28t_MnPK&`XdU0k7IZ#*5N+tyQPti8EKJMGE0fSb5@>2eS90&OGYQW|e zn#d;bysRiPqhQ;tkl52BeL}75P=Pn-tw45UcBoz5oJ!;x6j-646-9^0s!+F-j+?U{ zMnWJy;tK_RI`T~@FB}SVisFP&ATNr}Iww?#bc6BSzT@V?tU#A2PTcIWWv7IYk6n`G z_6b-=w3nh4+qLB9I%Jbsc{I-evUn7Yb28&>G9zpjS-cRNu!L?~j?K7+q*}p1x}AY^ z55kWyz8)pnE9t7o$d_$+2anTvPv8p@_*=5F0nLE}`KA@qE4fgQA?C@n|~`bh3u(Ts={u+q0zFfod-LM`yEM~m7c zftm5)_-NJoY+Z30fzOI!c6Q+OD9%uOWLIL2fg1v69#4Kc+2fM@2DGL8F@x_Drr%G| zgn?Q>qVyw0!b8cD(fAq@u@}>^kIC*El##Ye@EtD3_qY;2AcFmT8Gq!H@eAYOS3V!V z(TBg2?0=Ai2T1mVID|i0pdAuF4oe#xm0rwQeZ|ONNstlZk+I^H$-h8tRX>cevEMnS#P0_05qb+<`B#PTeaASj8Vki1{%|>e063z2r{cAPX!0jd*5{=b z%@6(?&Ht=L^Fzne{BSkR!?>LL>a(9o&dn{Phe;EER^Tk)? zI<`nB*ScAxT`NBRnp1sf$a+$15Pg!LsCh#65+ZYIPL<<6@Rx9Tq zat?5jGAo@xVwHjTm{kpn00v89srV&Hw8C?1BR>2!#(s{gMC$TYiI8Wd(_ zN8vqoH@C8s?(j$t)RUgI*ipN()KIFfBmZ7m{?0@GT3<>1WA&9Z;L=~hqV*$7OIg95 z=^K^G=#^McT#L2JzPnbUjiuoz&I<*WR1@QTx{KJA4;8pTtAfD)m?k|_yD;&lkTFY{ zX}y69qqwMxO%2oQQl?jrmI@aK!yZkl%lPSy;u5CvN?a#z~1FQXV^qZwmG=q+P0RK}r5 z#*-zdpj5)em?INWCM7seCSf@<)pat3|A3l`RWc15~xAx*RSH3rLf z&8|mul=iN@G)Vc&qKYRbxaEzeerSOcE8YLeR_XBojoB(ge`GO#80HWDo@55mhzU>% NkwMvNId?|R{{ew7bJPF; delta 5288 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 - + + @@ -52,7 +53,7 @@ a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, - a.doa_approval_status, a.doa_oa_approval_status, a.doa_jl_approval_status, + a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status, a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time from authorize a @@ -88,22 +89,22 @@ doa_number, doa_salesman_code, doa_salesman_bm, - doa_salesman_name, + doa_salesman_name, doa_salesman_dept_id, doa_salesman_dept_name, - doa_salesman_phone, - doa_project, + doa_salesman_phone, + doa_project, doa_customer_bm, - doa_customer_name, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_rejection_reasons, doa_standardizer, @@ -111,7 +112,8 @@ doa_vice_president_approved, doa_approval_status, doa_oa_approval_status, - doa_jl_approval_status, + doa_oa_remark, + create_by, create_time, update_by, @@ -123,22 +125,22 @@ #{doaNumber}, #{doaSalesmanCode}, #{doaSalesmanBm}, - #{doaSalesmanName}, + #{doaSalesmanName}, #{doaSalesmanDeptId}, #{doaSalesmanDeptName}, - #{doaSalesmanPhone}, - #{doaProject}, + #{doaSalesmanPhone}, + #{doaProject}, #{doaCustomerBm}, - #{doaCustomerName}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaRejectionReasons}, #{doaStandardizer}, @@ -146,7 +148,8 @@ #{doaVicePresidentApproved}, #{doaApprovalStatus}, #{doaOaApprovalStatus}, - #{doaJlApprovalStatus}, + #{doaOaRemark}, + #{createBy}, #{createTime}, #{updateBy}, @@ -157,58 +160,58 @@ insert into sys_oa_authorize - user_id, - department_id, - submission_time, + user_id, + department_id, + submission_time, doa_id, doa_code, - doa_salesman_name, - doa_salesman_phone, - doa_project, - doa_customer_name, + doa_salesman_name, + doa_salesman_phone, + doa_project, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_standardizer, doa_archiving, doa_vice_president_approved, create_time, - file_address, - isFinish, + file_address, + isFinish, - #{userId}, - #{departmentId}, - #{submissionTime}, + #{userId}, + #{departmentId}, + #{submissionTime}, #{doaId}, #{doaCode}, - #{doaSalesmanName}, - #{doaSalesmanPhone}, - #{doaProject}, - #{doaCustomerName}, + #{doaSalesmanName}, + #{doaSalesmanPhone}, + #{doaProject}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaStandardizer}, #{doaArchiving}, #{doaVicePresidentApproved}, #{createTime}, - #{fileAddress}, - #{isFinish}, + #{fileAddress}, + #{isFinish}, @@ -219,22 +222,22 @@ doa_number = #{doaNumber}, doa_salesman_code = #{doaSalesmanCode}, doa_salesman_bm = #{doaSalesmanBm}, - doa_salesman_name = #{doaSalesmanName}, + doa_salesman_name = #{doaSalesmanName}, doa_salesman_dept_id = #{doaSalesmanDeptId}, doa_salesman_dept_name = #{doaSalesmanDeptName}, - doa_salesman_phone = #{doaSalesmanPhone}, - doa_project = #{doaProject}, + doa_salesman_phone = #{doaSalesmanPhone}, + doa_project = #{doaProject}, doa_customer_bm = #{doaCustomerBm}, - doa_customer_name = #{doaCustomerName}, + doa_customer_name = #{doaCustomerName}, doa_owner_unit = #{doaOwnerUnit}, doa_generalcontract_unit = #{doaGeneralcontractUnit}, doa_subcontract_unit = #{doaSubcontractUnit}, - doa_authorizer = #{doaAuthorizer}, - doa_authorizer_phone = #{doaAuthorizerPhone}, - doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, + doa_authorizer = #{doaAuthorizer}, + doa_authorizer_phone = #{doaAuthorizerPhone}, + doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, doa_authorization_duration = #{doaAuthorizationDuration}, - doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, - doa_format = #{doaFormat}, + doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, + doa_format = #{doaFormat}, doa_remark = #{doaRemark}, doa_rejection_reasons = #{doaRejectionReasons}, doa_standardizer = #{doaStandardizer}, @@ -242,7 +245,8 @@ doa_vice_president_approved = #{doaVicePresidentApproved}, doa_approval_status = #{doaApprovalStatus}, doa_oa_approval_status = #{doaOaApprovalStatus}, - doa_jl_approval_status = #{doaJlApprovalStatus}, + doa_oa_remark = #{doaOaRemark}, + create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class index 02cc7118b8b086f784aaba4390117b9a46ec2288..b241e302100fc324634c1b42075c5b44681d9af8 100644 GIT binary patch literal 8438 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 ae91L6w+fM5?I9}=|9imUD-A!#ulx^aI!>1W diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml index adde604..5cc981f 100644 --- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml @@ -34,6 +34,8 @@ + + @@ -52,7 +54,7 @@ a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, - a.doa_approval_status, a.doa_oa_approval_status, a.doa_jl_approval_status, + a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status, a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time from authorize a @@ -88,22 +90,22 @@ doa_number, doa_salesman_code, doa_salesman_bm, - doa_salesman_name, + doa_salesman_name, doa_salesman_dept_id, doa_salesman_dept_name, - doa_salesman_phone, - doa_project, + doa_salesman_phone, + doa_project, doa_customer_bm, - doa_customer_name, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_rejection_reasons, doa_standardizer, @@ -112,6 +114,8 @@ doa_approval_status, doa_oa_approval_status, doa_jl_approval_status, + doa_oa_remark, + create_by, create_time, update_by, @@ -123,22 +127,22 @@ #{doaNumber}, #{doaSalesmanCode}, #{doaSalesmanBm}, - #{doaSalesmanName}, + #{doaSalesmanName}, #{doaSalesmanDeptId}, #{doaSalesmanDeptName}, - #{doaSalesmanPhone}, - #{doaProject}, + #{doaSalesmanPhone}, + #{doaProject}, #{doaCustomerBm}, - #{doaCustomerName}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaRejectionReasons}, #{doaStandardizer}, @@ -147,6 +151,8 @@ #{doaApprovalStatus}, #{doaOaApprovalStatus}, #{doaJlApprovalStatus}, + #{doaOaRemark}, + #{createBy}, #{createTime}, #{updateBy}, @@ -157,58 +163,58 @@ insert into sys_oa_authorize - user_id, - department_id, - submission_time, + user_id, + department_id, + submission_time, doa_id, doa_code, - doa_salesman_name, - doa_salesman_phone, - doa_project, - doa_customer_name, + doa_salesman_name, + doa_salesman_phone, + doa_project, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_standardizer, doa_archiving, doa_vice_president_approved, create_time, - file_address, - isFinish, + file_address, + isFinish, - #{userId}, - #{departmentId}, - #{submissionTime}, + #{userId}, + #{departmentId}, + #{submissionTime}, #{doaId}, #{doaCode}, - #{doaSalesmanName}, - #{doaSalesmanPhone}, - #{doaProject}, - #{doaCustomerName}, + #{doaSalesmanName}, + #{doaSalesmanPhone}, + #{doaProject}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaStandardizer}, #{doaArchiving}, #{doaVicePresidentApproved}, #{createTime}, - #{fileAddress}, - #{isFinish}, + #{fileAddress}, + #{isFinish}, @@ -219,22 +225,22 @@ doa_number = #{doaNumber}, doa_salesman_code = #{doaSalesmanCode}, doa_salesman_bm = #{doaSalesmanBm}, - doa_salesman_name = #{doaSalesmanName}, + doa_salesman_name = #{doaSalesmanName}, doa_salesman_dept_id = #{doaSalesmanDeptId}, doa_salesman_dept_name = #{doaSalesmanDeptName}, - doa_salesman_phone = #{doaSalesmanPhone}, - doa_project = #{doaProject}, + doa_salesman_phone = #{doaSalesmanPhone}, + doa_project = #{doaProject}, doa_customer_bm = #{doaCustomerBm}, - doa_customer_name = #{doaCustomerName}, + doa_customer_name = #{doaCustomerName}, doa_owner_unit = #{doaOwnerUnit}, doa_generalcontract_unit = #{doaGeneralcontractUnit}, doa_subcontract_unit = #{doaSubcontractUnit}, - doa_authorizer = #{doaAuthorizer}, - doa_authorizer_phone = #{doaAuthorizerPhone}, - doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, + doa_authorizer = #{doaAuthorizer}, + doa_authorizer_phone = #{doaAuthorizerPhone}, + doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, doa_authorization_duration = #{doaAuthorizationDuration}, - doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, - doa_format = #{doaFormat}, + doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, + doa_format = #{doaFormat}, doa_remark = #{doaRemark}, doa_rejection_reasons = #{doaRejectionReasons}, doa_standardizer = #{doaStandardizer}, @@ -243,6 +249,8 @@ doa_approval_status = #{doaApprovalStatus}, doa_oa_approval_status = #{doaOaApprovalStatus}, doa_jl_approval_status = #{doaJlApprovalStatus}, + doa_oa_remark = #{doaOaRemark}, + create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 4f754dc..8f18d8e 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -61,10 +61,10 @@ /> - + @@ -197,11 +197,6 @@ - - - - - @@ -332,9 +327,16 @@ - + - + + + + + + + + @@ -404,9 +406,7 @@ 保 存 提 交 - + 提交至OA 驳回 @@ -465,7 +465,7 @@ export default { 'PeopleSelect': PeopleSelect, 'ChangeRecord':ChangeRecord }, - dicts: ['doa_approval_status', 'doa_oa_approval_status', 'doa_jl_approval_status', 'doa_power_attorney_purpose', 'doa_format', 'doa_archiving'], + dicts: ['doa_approval_status', 'doa_oa_approval_status', 'doa_power_attorney_purpose', 'doa_format', 'doa_archiving'], data() { return { // 遮罩层 @@ -623,7 +623,7 @@ export default { doaVicePresidentApproved: null, doaApprovalStatus: null, doaOaApprovalStatus: null, - doaJlApprovalStatus: null, + doaOaRemark: null, createBy: null, createTime: null, updateBy: null,