From f82653454260a34a737a4ee3b7d7cb3b98dcc607 Mon Sep 17 00:00:00 2001 From: "izumi.wang" Date: Mon, 4 Dec 2023 15:00:10 +0800 Subject: [PATCH] init --- wms/account-index.php | 245 ++++++------ .../(Ñ╝¿╧Ñ╬)icon-star-active.png | Bin 0 -> 3828 bytes .../(Ñ╝¿╧Ñ╬)icon-star-default.png | Bin 0 -> 2647 bytes wms/board-index.php | 241 ++++-------- wms/class/Cmail.php | 21 +- wms/contract/insertData.php | 7 +- wms/css/jquery-ui.cssâ¬Zone.Identifier | 3 + wms/css/select2.min.cssâ¬Zone.Identifier | 3 + wms/css/view/wipwhole-index.php | 116 ------ wms/css/view/wipwhole-renovate-index.php | 59 --- .../ªs⌐±⌐≤ÑD╛≈└╔ªW.xlsx | Bin 0 -> 6189 bytes wms/gary.php | 104 +++-- wms/js/jquery-1.9.1.jsâ¬Zone.Identifier | 3 + wms/js/jquery-ui.jsâ¬Zone.Identifier | 3 + wms/js/select2.min.jsâ¬Zone.Identifier | 3 + wms/menu-edit.php | 357 ++++-------------- wms/menu-record-update.php | 157 +------- wms/sign/list.php | 51 +-- wms/wipwhole-change-contractdate.php | 33 +- ...wipwhole-change-planning-customer-name.php | 22 +- wms/wipwhole-index-function.php | 38 +- wms/wipwhole-index.php | 93 ++--- wms/wipwhole-rec-invoice-edit-fileupload.php | 2 - wms/wipwhole-rec-invoice-edit-submit.php | 262 +------------ wms/wipwhole-rec-invoice-edit.php | 307 +++------------ wms/wipwhole-rec-invoice.php | 1 - wms/wipwhole-renovate-index-function.php | 28 +- wms/wipwhole-renovate-index.php | 13 +- ...whole-renovate-rec-invoice-edit-submit.php | 235 +----------- wms/wipwhole-renovate-rec-invoice-edit.php | 297 ++------------- wms/wipwhole-renovate-rec-invoice.php | 1 - 31 files changed, 534 insertions(+), 2171 deletions(-) create mode 100644 wms/assets/img/icon/(Ñ╝¿╧Ñ╬)icon-star-active.png create mode 100644 wms/assets/img/icon/(Ñ╝¿╧Ñ╬)icon-star-default.png create mode 100644 wms/css/jquery-ui.cssâ¬Zone.Identifier create mode 100644 wms/css/select2.min.cssâ¬Zone.Identifier create mode 100644 wms/excel/ªs⌐±⌐≤ÑD╛≈└╔ªW.xlsx create mode 100644 wms/js/jquery-1.9.1.jsâ¬Zone.Identifier create mode 100644 wms/js/jquery-ui.jsâ¬Zone.Identifier create mode 100644 wms/js/select2.min.jsâ¬Zone.Identifier diff --git a/wms/account-index.php b/wms/account-index.php index df0c2d3f..ed0e9e1d 100644 --- a/wms/account-index.php +++ b/wms/account-index.php @@ -17,23 +17,23 @@ $sql_cmd = sql_myself($user_id); if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = ""; $sql = "SELECT * FROM account $sql_cmd ORDER BY id"; // 用mysqli_query方法執行(sql語法)將結果存在變數中 -$data = mysqli_query($link, $sql); +$data = mysqli_query($link,$sql); ?> - -

- - - -

+ +

+ + + +

Please fill up the required field!

"; } else { header("Location:account-index.php"); @@ -42,151 +42,126 @@ if ($data) : ?> - +
- + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + +
項次帳號類型帳號姓名電話地址電子郵件Line ID微信id遠端協助維修ID直屬主管建檔人建檔時間修改
項次帳號類型帳號姓名電話地址電子郵件Line ID微信id遠端協助維修ID直屬主管建檔人建檔時間修改新人資料
- 連結 -

- - - -

- 		連結 +

+ + + +

+ 		- -
- There is no record!"; endif; @@ -195,4 +170,4 @@ mysqli_close($link); include "footer.php"; -?> \ No newline at end of file +?> diff --git a/wms/assets/img/icon/(Ñ╝¿╧Ñ╬)icon-star-active.png b/wms/assets/img/icon/(Ñ╝¿╧Ñ╬)icon-star-active.png new file mode 100644 index 0000000000000000000000000000000000000000..b6da6739faa2a2cab62ecebb09dea2593b19dbf6 GIT binary patch literal 3828 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 mF6Nej8HgSEUt$6LY - -

- - - -

+ +

+ + + +

- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
項次主旨附件建檔人建檔時間關閉公告
- -

- - - - - -

-
-
+img { + width:125px; +} - +table{ + width:100%; +} +#table_index_filter{ + float:right; +} +#table_index_paginate{ + float:right; +} +label { + display: inline-flex; + margin-bottom: .5rem; + margin-top: .5rem; + +} - + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
項次主旨附件建檔人建檔時間關閉公告
+

+ + + + + +

+
+
- There is no record!"; endif; diff --git a/wms/class/Cmail.php b/wms/class/Cmail.php index f2edd6a6..51ed924b 100644 --- a/wms/class/Cmail.php +++ b/wms/class/Cmail.php @@ -1,5 +1,4 @@ charset = "UTF-8"; $this->host = "mail.masada.com.tw"; @@ -24,8 +23,8 @@ class Cmail $this->smtp_user = "notice"; // 這裡填寫SMTP登入帳號, 例如 your.gmail.name@gmail.com 則填寫your.gmail.name $this->smtp_pwd = "90493119"; // 這裡填寫SMTP登入密碼 } - - function sendx($subject = "", $em_body = "", $sendlist = array(), $from = "永佳捷科技", $bcc = "", $files = array()) + + function sendx($subject="", $em_body="", $sendlist=array(), $from="永佳捷科技", $bcc="", $files=array()) { if (!$sendlist) return; $em_body = nl2br($em_body); @@ -53,15 +52,11 @@ class Cmail //$mail->addCC("personC@gmail.com", "person C"); //$mail->addBCC("personD@gmail.com", "person D"); //$mail->addAttachment("image1.jpg", "picture.jpg"); //設定附件, 對方會看到附件名稱為 picture.jpg - foreach ($files as $v) { - list($file, $file_name) = $v; - $mail->addAttachment($file, $file_name); - } //print_r($mail);exit; - if (!$mail->Send()) { + if (!$mail->Send()){ // echo "Mailer error: " . $mail->ErrorInfo; } else { //echo "Email sent"; } } -} +} \ No newline at end of file diff --git a/wms/contract/insertData.php b/wms/contract/insertData.php index 0d19cfee..5f1ffc00 100644 --- a/wms/contract/insertData.php +++ b/wms/contract/insertData.php @@ -109,8 +109,11 @@ foreach ($sheet->getRowIterator() as $key=>$row) { $kind ='D'; $subkind = 'D2'; }elseif($id == 15){ - $kind ='B'; - $subkind = 'B1'; + $kind ='E'; + $subkind = 'E1'; + }elseif($id == 16){ + $kind ='F'; + $subkind = 'F1'; } if(isset($_GET['id'])){ diff --git a/wms/css/jquery-ui.cssâ¬Zone.Identifier b/wms/css/jquery-ui.cssâ¬Zone.Identifier new file mode 100644 index 00000000..d72c7818 --- /dev/null +++ b/wms/css/jquery-ui.cssâ¬Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=http://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css diff --git a/wms/css/select2.min.cssâ¬Zone.Identifier b/wms/css/select2.min.cssâ¬Zone.Identifier new file mode 100644 index 00000000..d6a27703 --- /dev/null +++ b/wms/css/select2.min.cssâ¬Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css diff --git a/wms/css/view/wipwhole-index.php b/wms/css/view/wipwhole-index.php index c24af508..8284d7ca 100644 --- a/wms/css/view/wipwhole-index.php +++ b/wms/css/view/wipwhole-index.php @@ -3,27 +3,22 @@ #table_index2_paginate { text-align: right; } - #table_index3_filter, #table_index3_paginate { text-align: right; } - #table_index4_filter, #table_index4_paginate { text-align: right; } - #table_index5_filter, #table_index5_paginate { text-align: right; } - #table_index6_filter, #table_index6_paginate { text-align: right; } - #table_index7_filter, #table_index7_paginate { text-align: right; @@ -71,117 +66,6 @@ text-align: center; } - #loadingOverlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(255, 255, 255, 0.7); - /* 透明度的背景颜色 */ - z-index: 9999; - /* 确保在最上层显示 */ - /* 添加加载动画的样式 */ - } - - .hidden { - display: none; - } - - #loadingOverlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(255, 255, 255, 0.7); - /* 半透明的背景 */ - z-index: 9999; - /* 确保显示在最上层 */ - display: flex; - justify-content: center; - align-items: center; - } - - .loading-text { - text-align: center; - margin-top: 10px; - /* 调整文字与图标之间的间距 */ - font-size: 16px; - color: #333; - /* 文字颜色 */ - } - - .loading-icon { - /* 这里是你加载图标的样式，可以是一个动画、GIF图或者SVG等 */ - /* 例如一个简单的加载圆圈动画 */ - border: 10px solid #f3f3f3; - /* 灰色边框 */ - border-top: 10px solid #3498db; - /* 蓝色顶部边框 */ - border-radius: 50%; - width: 80px; - height: 80px; - animation: spin 2s linear infinite; - /* 旋转动画 */ - } - -/* The Modal (background) */ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - padding-top: 100px; /* Location of the box */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - -} -.modal .back{ - position: absolute; - top: 0; - left:0; - width: 100%; - height: 100%; - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} -/* Modal Content */ -.modal-content { - z-index: 9; - background-color: #fefefe; - margin: auto; - padding: 20px; - border: 1px solid #888; - width: 80%; -} - -/* The Close Button */ -.close { - color: #aaaaaa; - float: right; - font-size: 28px; - font-weight: bold; -} - -.close:hover, -.close:focus { - color: #000; - text-decoration: none; - cursor: pointer; -} - - - @keyframes spin { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } - } @media screen and (max-width: 600px) { diff --git a/wms/css/view/wipwhole-renovate-index.php b/wms/css/view/wipwhole-renovate-index.php index 9bd7eef9..8284d7ca 100644 --- a/wms/css/view/wipwhole-renovate-index.php +++ b/wms/css/view/wipwhole-renovate-index.php @@ -3,27 +3,22 @@ #table_index2_paginate { text-align: right; } - #table_index3_filter, #table_index3_paginate { text-align: right; } - #table_index4_filter, #table_index4_paginate { text-align: right; } - #table_index5_filter, #table_index5_paginate { text-align: right; } - #table_index6_filter, #table_index6_paginate { text-align: right; } - #table_index7_filter, #table_index7_paginate { text-align: right; @@ -71,60 +66,6 @@ text-align: center; } - #loadingOverlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(255, 255, 255, 0.7); - /* 透明度的背景颜色 */ - z-index: 9999; - /* 确保在最上层显示 */ - /* 添加加载动画的样式 */ - } - - .hidden { - display: none; - } - - #loadingOverlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(255, 255, 255, 0.7); - /* 半透明的背景 */ - z-index: 9999; - /* 确保显示在最上层 */ - display: flex; - justify-content: center; - align-items: center; - } - - .loading-text { - text-align: center; - margin-top: 10px; - /* 调整文字与图标之间的间距 */ - font-size: 16px; - color: #333; - /* 文字颜色 */ - } - - .loading-icon { - /* 这里是你加载图标的样式，可以是一个动画、GIF图或者SVG等 */ - /* 例如一个简单的加载圆圈动画 */ - border: 10px solid #f3f3f3; - /* 灰色边框 */ - border-top: 10px solid #3498db; - /* 蓝色顶部边框 */ - border-radius: 50%; - width: 80px; - height: 80px; - animation: spin 2s linear infinite; - /* 旋转动画 */ - } @media screen and (max-width: 600px) { diff --git a/wms/excel/ªs⌐±⌐≤ÑD╛≈└╔ªW.xlsx b/wms/excel/ªs⌐±⌐≤ÑD╛≈└╔ªW.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d7b52d089989bc360d9183a9d3033e3c2d00395b GIT binary patch literal 6189 zcmZ`-2Q-}B)}90*dXFx8uR-)a!RXPV1v5q)j3A=-UV_nENJfd0=)FZ7BnTo1BBDg^ zWrT=-@_qNe`QqL?YrW^Jch-9Lde46L+2zsG#KNWo004LZc7sD>HH2!7*);%Q4;uiW z!2D~j0(bR8bv(u?a*#=UVVA%Dy{^h z{sw3CFdvYG)UCC%FU*bF6-GHX({Zc!*?wif0dpsNZ-Ib9aK;U zwoGA%xxA*o6-Z9A_z*%9k3YgTpvQtTv(H;kmhB;*l;%v7ao-h1zwGg8Q^};|nU#Bf z|8?T%rAo=;oDij?z;8C1uO=wYCeJ>$)|YGc&sUfdy**--j#-^=d2>^|3E+%K;Wki9 zUqhZrpFC`+VtOCNoKv8Gnc}V9n!vf|MJxY60djeC37g>EJcUk-u1&r`XTEgMDFE1d|S{c zT7x_4yb{HpUfnJbaPAXTjngvT^EACkH$U9#+=uR?Ow@GThblpk-d6ndd_CR6jgpU8 zFEa;B>H4Z8@2E|iJZZIO;#tX_K9(;de59|Efe2EKFJ6iPvplo>>Bz2?dT^(1ZIEz6 z)b;HFQxE)xAwjXU8PQjV#)6I7RrBd_vG%WFnT;`)Eu+_cbhh|s(@2`-3*||WPWS>` zM8-orQEUh_@E+DfiJ3XqBXphQBUa6rQT2sQc`Mqf@X5>O7f@8 zd+>xl(D2H5~4`T%e8U)fw=fPu4ebL#qQq+2!05F@ZTj(-Qtu`P zUk*Qf!fgWm&i-KzYlA?yx)y(Y#Q1hL&tg!U%IwJvt1zkfweO&C_GghpLUei3wm52* zw#-RWOD38qkNG~2vwT_Na&tnGIO7FRNwW{D}m;D|&Bg%x#c3|QkM=8KjR$}?XOR@HQNfNZr=7N zxmk)e0+k*Z6`NeJ6c%FiO)szc!M;DR2CINC+H#LP-F$XARYz<$pr(6nFcfGO5Hn_q zl}l2}T%i%7+|$>HR4Q3+E3FwL9@eb!A1^{2-rpvaoU?^|4rVhvNYg{(^$aywQ#gJ+ zY*FiBp|ZVPE`6oCPmdQRnYPAay2n3K;~@gR6_fIlYWz-pv=&Hb8EQAv>^GV?(XB4>S6X~u@vhX!H%u89JBB;2( ziR8%}Z`uR#QZE7aionha7KpVjO?GBLE!GtU!)ZwhJWST@LgHpG9PHWaIr)` z8x$-V60S;Sk&m;;TWPXrcL#p2%Z7gez{Nkg|ak)fIM!nt^vu1K?YwpDLn0R|A8DLty~cGQVng|38RxD2O-^N=R%w9yY4<6+uccVM@Q;fooQV>1JQs8T2xHi1Tn_KAseOA4 z}7=UXISeCHdBO_<$%Cii*6LZ=rqDhj+N3rGbKMC?k_A_n80RW2W z|1OD`tmEkbb%Fl9iu|Hz+f)}mD?!=0Ye3r4SmVs|I8++AHNBl)Ohn$Ol31szS;3=! zd%duOX#3HdV4KfX?}9&j(KJvwgjlxdro8Hzymo=_cLvFcEfsUT>U06!p$gNQnXRhO|f?kRl%Xb zvdQ#K5Fn_CzCj=$6Llb}t8pC$5d>FQb1Tb`p5jfThFm4+U|#W#;OE%=Z;nsAwE{vT zX*FRUBW>>&`1D0{_Oc}RJYuAQPl-5nPT1^g`mv>ZD9i?sBG-DV;amyZHqQ`GMyL`x$m^6Z@SPr|XrS z{x&yw8BZ6>xjGg64i-1x|2+L!eXWCIPd$pnQH#9=_;gf0u}dNhAWFW9q`8-A%6Gb1@g5YY!yNI#eJgs!s5wV-Y z-F=4r+Yo;T#Ag|@nV(`2d0N{1eq^ODoBMCiNV4D5=QdxWP$slRbH6%$oN*SaDQ~>S z1hmvj5TqSX7Nz)HAkqu9yHBcYxj(#PIk7U-8<@jjoSa0One~9&_|ej1StCgar+7#) z8yrlPl`5Ngvvbj{^!7N54Z|@OYf;R%hD@W0&s};k@it$ewN0^SgN_Sve^Cn{1Q0Q2k63*Sn|@kw(y*EYY>cwe*lVjDs9eFz8W#7VlQP+D27AZ_Z1e|f16lJI;r zv|kb@P?XOoGeV>Pz{v3}EaiJ)*Eg4SF(;ze(drR~vk&g!7~7R$4@Lz@_Uq~_I4d^w_ zd4C)ds$E!y<%`M)YqD8P7B*0yUw@_`oCZ zdIK-MMsB9MNslawH}&2GGoAy3yJ^9#(7FLbWq!Y?ymb(9#^dq@eadFx`{!b+p~^)D z$+vBF)4Vz&vp!6`pOQk>jPOsSIqu7_MuijAZdtzDYSa^}4%Hlttl(~CFv@TE((fUB>)ypuswalsY={#`10^OHuE4w5mo zxToY@_u3`|Kfpz#uIJ5WKcX!UYDh4PEU={5jdPY4w{LXH4QOe)`=r5sul`9(`SwT3 z`uaF6d9&|#;u3elwp^N+wX+a?ekHhWJln&UkpTG$;{}yUVm=HqUuUC%Mu*J3_%mgh+ihbZavr=VR8F@#K|0&2st(!q-psEV1 zho85oSIUre*a9ZVOZZf+S_x!FKfAzg)B0hqZVmLBlw-md0X1OE<B9kuvz#4a~j zb6?J~j@5oo$;{xx!Se!aEqH_&L_3Ia7M;(1b0A^iE#1p?!Vr1!-Ll}?&PNb$}%zT(E-U;G!KMgx90THu9ZLKqd8P=A7b*M zK_FddEOOImk=~@{P&AqU*2AZyvq_-OXVRluVrfg!3)=KVHH%AI*0A7}rc2etXYW_O z_6XWYfj^Je9<*>+{cKAr)am5 z09y6Hv|U!B)WTUS8)t_IQ%-t~pvv@mt9K70rx56(`AM!hDe*=LxO&4guFoOx43618 z)sW${76<2(TO4Z0uMG~)E*^K|TGQeD8k_nbRt>eswwXS&Q-KaqlrM^#2+@8CZE>9j zuUV}ZQo5HC%GM);f|F8yYE|khtbAIet6vcC{N&hh@p4$7gWgR3`<@`msFzr&mEJ`6gi4k2P-n_Gc!>0*r&(Gm?7RBEX35g z{a!{PXivxGHU(;QeF0tM@;D$OoqIT>=N|C|qAZ?92Hs@$LL^JQ{Rh zpBhhP^;R+IZb6)gUWwW_F&JG9o41OZh!W|0(%QTHP8~3HcP(8ufZtRbY_=9fPk4@B z`y-p~5zS~fv@Rv;O)D#Hu8nETJ*~o9hu0YAb{Y&hi*`}(+DLTx?4uQq2S%TqsZKOS zToU?#n7KTGQZBlWYfoFhKQ`{Z=~ZORHon`A#HR9zt11fG2O6P7U9F*$dDP=}i%qKi zNkT+Ds|+QE%^uIN7lX4-iwjD-n6P~Pc|C|w$=IVbjaFb(3C(m9eGbwiYI(7|c|7hJ zeZ+NS0PTp~MJ-_S$ds>LLcQr;)Q{=)GcUacr)RH>;9g0*hWHVRA2s>NOhh-Ug>#?F z9vB7Pk7E$^qY+lL0wAWLoaULa+&;`3CFMW0C7-m6&aB@W)9nryN*_nNMfY8q@5K0GKm8hhC2s%#G{1@UaDYNRJusOHv;EbNCKzfPVCFo` zjdt+l(lI+zLW!t6=NTHkiB*?N<>&%S;xIuhy{X&<{d_~~JHSG*{r3E%y(De?Fra9F zxFY3V~KqEhVFa|1kfe5UUx!0s%=!Sxfs;Xs%2an`05r$eDOg4^*UBW(s zQWmuHh6Mq*U?q{nYzrRP-Gc2teedoX>SGdrPRh!bJTmyBGvZ3b9G$(p!cy@@X}gI} zdM@MIoJs$+u4g?#&Sj?}ExdO5IcL~kosR7I(vF14;t;VyaC{g3SzcMSiM~@+c0ZD! zHZ9e+;~R#KPbkO=ntzliu($7G7j4 z%bBW%Ydmu((=B>&@lsQw6QvI23HyrPSw^Ab*b}A~P9xpDg5MmB1uu}aa@$K>JpQyj zfVS%DO5s<5{7Ue>6#_XK`Azk3ysTC0>ZyCt%rc`$k|mUx*=oOM;U0THjL@jCy4Ij_ zl*O)Ie*gDdFX#niLk8(GEYX5;75mf2r{Bf!Hmj}amP2M9xRdr-^GnAU->@wudH;s7 zcAm_YZu`7i6Q!nbj{9dG8`iwf>WvBW1kA(sAL0JD^z%FD{}O(*<3)(CvycM(tdtti ziUg3MM^oPcNRnwcK2jSNevvaj9s#bDET4ISz=LT<20!@zv^QsC!&B@MNC zVJc1nEAj^!pZ$^H0b=A}DsfJJYUSPI7xhhwv{2qO?@W6~+VeNx9s|+Jx@QhU8jY8@ zYb%%!zjht##{bq)F<+1Q-TrI+ud3=*16S3*zmdNT#9=b~KeWKBz^fwJZ(trKbNp|~ z?5drsTGDSj9hfHKskwBb@T&%{HgdlW zToV5Gw(hEht1Z)S3saa5>Q`gIN{{ReGwTS=# literal 0 HcmV?d00001 diff --git a/wms/gary.php b/wms/gary.php index d18ed12d..90696e89 100644 --- a/wms/gary.php +++ b/wms/gary.php @@ -3,61 +3,59 @@ ini_set('display_errors', 'on'); include "fun_global.php"; include "database.php"; -print_r(manage_class("M0117")); -echo manage_class("M0117")[0]; -// // account table -// $accounttype = "A"; -// $accountid = ""; -// $pwd = "123"; -// $name = ""; -// $creater = ""; -// $create_at = date("Y-m-d H:i:s"); +// account table +$accounttype = "A"; +$accountid = ""; +$pwd = "123"; +$name = ""; +$creater = ""; +$create_at = date("Y-m-d H:i:s"); -// // 檢查 accountid 是否未重複並寫入 account 資料表 -// $sql = " -// SELECT DISTINCT -// a.accountid, -// w.contractno, -// w.custom -// FROM wipwholestatus AS w -// LEFT JOIN ( -// SELECT -// accountid -// FROM account -// ) AS a -// ON a.accountid = w.contractno -// WHERE a.accountid IS NULL -// "; -// $data = mysqli_query($link, $sql); +// 檢查 accountid 是否未重複並寫入 account 資料表 +$sql = " + SELECT DISTINCT + a.accountid, + w.contractno, + w.custom + FROM wipwholestatus AS w + LEFT JOIN ( + SELECT + accountid + FROM account + ) AS a + ON a.accountid = w.contractno + WHERE a.accountid IS NULL +"; +$data = mysqli_query($link, $sql); -// $J = 0; -// foreach ($data as $key => $row) : -// echo $row['accountid']."
"; -// echo $J++; -// if (empty($row['accountid'])) { +$J = 0; +foreach ($data as $key => $row) : + echo $row['accountid']."
"; + echo $J++; + if (empty($row['accountid'])) { -// $accountid = $row['contractno']; -// $name = $row['custom']; -// echo $sql2 = " -// INSERT INTO account ( -// accounttype, -// accountid, -// pwd, -// name, -// creater, -// create_at -// ) VALUES ( -// '$accounttype', -// '$accountid', -// '$pwd', -// '$name', -// '$creater', -// '$create_at' -// ) -// "; -// echo "
"; -// mysqli_query($link, $sql2); -// } -// endforeach; + $accountid = $row['contractno']; + $name = $row['custom']; + echo $sql2 = " + INSERT INTO account ( + accounttype, + accountid, + pwd, + name, + creater, + create_at + ) VALUES ( + '$accounttype', + '$accountid', + '$pwd', + '$name', + '$creater', + '$create_at' + ) + "; + echo "
"; + mysqli_query($link, $sql2); + } +endforeach; diff --git a/wms/js/jquery-1.9.1.jsâ¬Zone.Identifier b/wms/js/jquery-1.9.1.jsâ¬Zone.Identifier new file mode 100644 index 00000000..103119d3 --- /dev/null +++ b/wms/js/jquery-1.9.1.jsâ¬Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=http://code.jquery.com/jquery-1.9.1.js diff --git a/wms/js/jquery-ui.jsâ¬Zone.Identifier b/wms/js/jquery-ui.jsâ¬Zone.Identifier new file mode 100644 index 00000000..68fd81a2 --- /dev/null +++ b/wms/js/jquery-ui.jsâ¬Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=http://code.jquery.com/ui/1.10.4/jquery-ui.js diff --git a/wms/js/select2.min.jsâ¬Zone.Identifier b/wms/js/select2.min.jsâ¬Zone.Identifier new file mode 100644 index 00000000..ff4df914 --- /dev/null +++ b/wms/js/select2.min.jsâ¬Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js diff --git a/wms/menu-edit.php b/wms/menu-edit.php index d202247c..b7602d89 100644 --- a/wms/menu-edit.php +++ b/wms/menu-edit.php @@ -1,302 +1,95 @@ - - +
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
+
+ +
- -
-
- - -
-
- - - - - -
-
- - -
+
+ +
- -
-
- - -
-
- - - - - -
-
- - -
+
+ +
- -
-
- - -
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+
+
">
- - \ No newline at end of file diff --git a/wms/menu-record-update.php b/wms/menu-record-update.php index 8787ca98..81d07022 100644 --- a/wms/menu-record-update.php +++ b/wms/menu-record-update.php @@ -1,172 +1,29 @@ $v) { - // $$k = htmlspecialchars(stripslashes(trim($v))); - // } - - if (!empty($_POST['can_read'])) { - $auth_change_status = true; - $link_content = explode("\r\n", $_POST['link_content']); - foreach ($_POST['can_read'] as $id) { - - // 更新部門可寫權限 json - $permission = []; - $department_id = 0; - $role_id = 0; - - $sql = " - SELECT - department_id, - role_id, - permission - FROM department - WHERE 1=1 - AND id = '$id' - "; - $result = mysqli_query($link, $sql); - $data = mysqli_fetch_assoc($result); - $department_id = $data['department_id']; - $role_id = $data['role_id']; - mysqli_free_result($result); - $permission = json_decode($data['permission'], true); - foreach ($link_content as $row) { - $permission[$row] = '1'; - } - $new_permiccion = json_encode($permission); - - // 更改此職位權限 - $sql = " - UPDATE department - SET permission = '$new_permiccion' - WHERE 1=1 - AND id = '$id' - "; - mysqli_query($link, $sql); - - // 更改此職位底下所有員工的權限 - $sql = " - SELECT accountid - FROM account - WHERE 1=1 - AND department_id = '$department_id' - AND role_id = '$role_id' - "; - $result = mysqli_query($link, $sql); - $data2 = mysqli_fetch_all($result, MYSQLI_ASSOC); - mysqli_free_result($result); - foreach ($data2 as $row) { - $sql = " - UPDATE account_auth - SET permission = '$new_permiccion' - WHERE 1=1 - AND accountid = '" . $row['accountid'] . "' - "; - mysqli_query($link, $sql); - } - } +if(isset($_POST['update'])) { + foreach ($_POST as $k => $v) { + $$k = htmlspecialchars(stripslashes(trim($v))); } - if (!empty($_POST['can_write'])) { - $auth_change_status = true; - $link_content = explode("\r\n", $_POST['link_content']); - foreach ($_POST['can_write'] as $id) { - - // 更新部門可寫權限 json - $permission = []; - $department_id = 0; - $role_id = 0; - - $sql = " - SELECT - department_id, - role_id, - permission - FROM department - WHERE 1=1 - AND id = '$id' - "; - $result = mysqli_query($link, $sql); - $data = mysqli_fetch_assoc($result); - $department_id = $data['department_id']; - $role_id = $data['role_id']; - mysqli_free_result($result); - $permission = json_decode($data['permission'], true); - foreach ($link_content as $row) { - $permission[$row] = '3'; - } - $new_permiccion = json_encode($permission); - - // 更改此職位權限 - $sql = " - UPDATE department - SET permission = '$new_permiccion' - WHERE 1=1 - AND id = '$id' - "; - mysqli_query($link, $sql); - - // 更改此職位底下所有員工的權限 - $sql = " - SELECT accountid - FROM account - WHERE 1=1 - AND department_id = '$department_id' - AND role_id = '$role_id' - "; - $result = mysqli_query($link, $sql); - $data2 = mysqli_fetch_all($result, MYSQLI_ASSOC); - mysqli_free_result($result); - foreach ($data2 as $row) { - $sql = " - UPDATE account_auth - SET permission = '$new_permiccion' - WHERE 1=1 - AND accountid = '" . $row['accountid'] . "' - "; - mysqli_query($link, $sql); - } - } - } - $main_menu_seq = empty($_POST['main_menu_seq']) ? '' : $_POST['main_menu_seq']; - $main_menu = empty($_POST['main_menu']) ? '' : $_POST['main_menu']; - $sub_menu_seq = empty($_POST['sub_menu_seq']) ? '' : $_POST['sub_menu_seq']; - $sub_menu = empty($_POST['sub_menu']) ? '' : $_POST['sub_menu']; - $sub_menu_eng = empty($_POST['sub_menu_eng']) ? '' : $_POST['sub_menu_eng']; - $mlink = empty($_POST['mlink']) ? '' : $_POST['mlink']; - $link_content = empty($_POST['link_content']) ? '' : $_POST['link_content']; - $status = empty($_POST['status']) ? '' : $_POST['status']; - $id = empty($_POST['id']) ? '' : $_POST['id']; - $create_at = date('Y-m-d H:i:s'); - //$link_content = str_replace(PHP_EOL, ',', $link_content); $db_query = "UPDATE menu set main_menu_seq = '$main_menu_seq', main_menu = '$main_menu', sub_menu_seq = '$sub_menu_seq', sub_menu = '$sub_menu', "; $db_query .= "sub_menu_eng = '$sub_menu_eng', mlink = '$mlink', link_content = '$link_content', status = '$status', create_at = '$create_at' WHERE id='$id'"; - mysqli_query($link, $db_query); $affected = mysqli_affected_rows($link); mysqli_close($link); if ($affected > 0) { echo ""; - } elseif ($auth_change_status == true) { - echo ""; } elseif ($affected == 0) { echo ""; + echo "location.href='menu-index.php?function_name=menu&".$token_link."';"; + echo ""; } else { echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link); } } +?> \ No newline at end of file diff --git a/wms/sign/list.php b/wms/sign/list.php index 7fc3c622..d8b732d8 100644 --- a/wms/sign/list.php +++ b/wms/sign/list.php @@ -1,6 +1,6 @@
@@ -154,7 +133,7 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR));
- + @@ -171,27 +150,7 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR)); if ($data['flow_code'] !== 'Z') { ?> - + diff --git a/wms/wipwhole-change-contractdate.php b/wms/wipwhole-change-contractdate.php index 35aa30b0..ee6ff0f3 100644 --- a/wms/wipwhole-change-contractdate.php +++ b/wms/wipwhole-change-contractdate.php @@ -1,6 +1,36 @@ menu_v3($user_id, $accounttype); + $login_json = json_encode($jsonres, JSON_UNESCAPED_UNICODE); +} + +?> + + -
- - - - $data, @@ -299,7 +272,6 @@ mysqli_close($link); $(function() { $(".data_table_div").hide(); showTable(sheetNum); - document.getElementById('loadingOverlay').classList.add('hidden'); }) const formData = new FormData(); @@ -396,7 +368,6 @@ mysqli_close($link); } function showTable(code) { - console.log(code); var tmp_arr = { "All": "1", "A": "2", @@ -405,8 +376,8 @@ mysqli_close($link); "CH": "5", "Z": "6", } - $("nav.navbar.navbar-tabs div > ul > li").attr("class", ""); - $("nav.navbar.navbar-tabs div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active"); + $("body > nav.navbar.navbar-tabs > div > ul > li").attr("class", ""); + $("body > nav.navbar.navbar-tabs > div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active"); $(".data_table_div").hide(); $("#data_" + code + "_table_div").show(); } @@ -532,22 +503,6 @@ mysqli_close($link); $("#del_form").submit(); } - - diff --git a/wms/wipwhole-rec-invoice-edit-fileupload.php b/wms/wipwhole-rec-invoice-edit-fileupload.php index 82f3cb93..98acc091 100644 --- a/wms/wipwhole-rec-invoice-edit-fileupload.php +++ b/wms/wipwhole-rec-invoice-edit-fileupload.php @@ -67,5 +67,3 @@ $completion_acceptance_file = fileIUpload("completion_acceptance_file"); $shengguanok_status_file = fileIUpload("shengguanok_status_file"); // 工務助理 $outsourcer_contract_file = fileIUploads("outsourcer_contract_file"); -// 品證 -$official_check_file = fileIUpload("official_check_file"); \ No newline at end of file diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php index 1de98846..0412cc22 100644 --- a/wms/wipwhole-rec-invoice-edit-submit.php +++ b/wms/wipwhole-rec-invoice-edit-submit.php @@ -1,5 +1,5 @@ $v) { $$k = htmlspecialchars(stripslashes(trim($v))); } - $id = empty($_POST['id']) ? null : $_POST['id']; // 檢查簽核狀態 - if (checkWwsAssianStatus($link, $user_id, $id)) { + if (checkWwsAssianStatus($link, $user_id)) { echo "退回至工務階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回至工務階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回至工務階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['gongwokname'], $data['gongwokmail']], - ], - "永佳捷科技" - ); do_wws_next_assign(getGongWuokNo($link), $form_key, 'A'); } } @@ -963,22 +899,7 @@ function backMarketingSssign($link, $salesid, $user_id) if (isset($_GET['id']) || isset($_GET['form_key'])) { $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']); $form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $id); - include "./class/Cmail.php"; - $cmail = new Cmail(); - $data = getWipwholestatusDetail($link, $id); - $data['salesname'] = accountid2name($data['salesid'])[$data['salesid']]; - $data['salesmail'] = accountid2email([$data['salesid']])[$data['salesid']]; write_note($link, $id, $user_id, "退回至營業階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回營業階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回營業階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['salesname'], $data['salesmail']], - ], - "永佳捷科技" - ); do_wws_next_assign($salesid, $form_key, 'B'); } } @@ -989,22 +910,7 @@ function backDesignssign($link, $user_id) if (isset($_GET['id']) || isset($_GET['form_key'])) { $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']); $form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $id); - include "./class/Cmail.php"; - $cmail = new Cmail(); - $data = getWipwholestatusDetail($link, $id); - $data['designname'] = accountid2name("M0173")["M0173"]; - $data['designmail'] = accountid2email(["M0173"])["M0173"]; write_note($link, $id, $user_id, "退回至設計階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回設計階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回設計階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['designname'], $data['designmail']], - ], - "永佳捷科技" - ); do_wws_next_assign("M0173", $form_key, 'C'); } } @@ -1021,172 +927,43 @@ function write_note($link, $id, $user_id, $content) mysqli_query($link, $updatesql); } -// 各區營銷(契約)經理判斷程式 -function checkUseridIsManager($user_id) -{ - // 北區 劉永德 - if (in_array($user_id, ['M0137'])) - return true; - // 中區 李烘銘 - if (in_array($user_id, ['M0086'])) - return true; - // 桃竹 張莉凱 - if (in_array($user_id, ['M0026'])) - return true; - // 宜花東 陳志文 - if (in_array($user_id, ['M0054'])) - return true; - // 南區 吳育宗 - if (in_array($user_id, ['M0033'])) - return true; - return false; -} - // 表單簽核狀態檢查主程式 function checkWwsAssianStatus($link, $user_id) { - if (isset($_GET['id']) || isset($_GET['form_key'])) { $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']); $form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $id); } - include "./class/Cmail.php"; - $cmail = new Cmail(); - $data = getWipwholestatusDetail($link, $id); - $data['salesname'] = accountid2name($data['salesid'])[$data['salesid']]; - $data['salesmail'] = accountid2email([$data['salesid']])[$data['salesid']]; - $data['salesmanagername'] = accountid2name(manage_class($data['salesid'])[0])[manage_class($data['salesid'])[0]]; - $data['salesmanagermail'] = accountid2email([manage_class($data['salesid'])[0]])[manage_class($data['salesid'])[0]]; - $data['designname'] = accountid2name("M0173")["M0173"]; - $data['designmail'] = accountid2email(["M0173"])["M0173"]; - $data['designleadername'] = accountid2name(getSheJiokLeaderNo($link))[getSheJiokLeaderNo($link)]; - $data['designleadermail'] = accountid2email([getSheJiokLeaderNo($link)])[getSheJiokLeaderNo($link)]; - $data['gongwokname'] = accountid2name(getGongWuokNo($link))[getGongWuokNo($link)]; - $data['gongwokmail'] = accountid2email([getGongWuokNo($link)])[getGongWuokNo($link)]; - $data['shengguanokname'] = accountid2name(getShengGuanokLeaderNo($link))[getShengGuanokLeaderNo($link)]; - $data['shengguanokmail'] = accountid2email([getShengGuanokLeaderNo($link)])[getShengGuanokLeaderNo($link)]; - // 確認工務階段 進入營業階段 if (checkNowFormStatus($link) == 'A' && checkGongWuok($link, $id) == '0') { write_note($link, $id, $user_id, "工務提交至營業階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-工務提交至營業階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-工務提交至營業階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['salesname'], $data['salesmail']], - [$data['gongwokname'], $data['gongwokmail']] - ], - "永佳捷科技" - ); do_wws_next_assign(getYingYeokNo($link), $form_key, 'B'); return; } // 確認營業階段 進入設計人員(汰改:林坤翰 M0052 改 林昭翰 M0173)階段 if (checkNowFormStatus($link) == 'B' && checkYingYeok($link, $id) == '0') { - if (checkUseridIsManager($user_id)) { - write_note($link, $id, $user_id, "營業提交至設計階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至設計階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至設計階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['salesname'], $data['salesmail']], - [$data['designname'], $data['designmail']] - ], - "永佳捷科技" - ); - do_wws_next_assign("M0173", $form_key, 'C'); - return; - } else { - write_note($link, $id, $user_id, "營業提交至營業經理階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至營業經理階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至營業經理階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['salesname'], $data['salesmail']], - [$data['salesmanagername'], $data['salesmanagermail']] - ], - "永佳捷科技" - ); - do_wws_next_assign(manage_class($data['salesid'])[0], $form_key, 'F'); - } - } - - // 確認營業主管階段 進入設計人員(新梯:郭承瑋 M0023)階段 - if (checkNowFormStatus($link) == 'F' && checkYingYeok($link, $id) == '0') { - if (checkUseridIsManager($user_id)) { - write_note($link, $id, $user_id, "營業經理提交至設計階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['salesname'], $data['salesmail']], - [$data['designname'], $data['designmail']] - ], - "永佳捷科技" - ); - do_wws_next_assign("M0173", $form_YD_key, 'C'); - return true; - } + write_note($link, $id, $user_id, "營業提交至設計階段"); + do_wws_next_assign("M0173", $form_key, 'C'); + return; } - // 確認設計人員(汰改:林坤翰 M0052 改 林昭翰 M0173)階段 進入設計主管階段 if (checkNowFormStatus($link) == 'C' && checkSheJiok($link, $id) == '0') { write_note($link, $id, $user_id, "設計提交至設計主管階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計提交至設計主管階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計提交至設計主管階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['designleadername'], $data['designleadermail']], - [$data['designname'], $data['designmail']] - ], - "永佳捷科技" - ); do_wws_next_assign(getSheJiokLeaderNo($link), $form_key, 'D'); return; } // 確認設計主管(江京鴻 M0019)階段 進入生管階段 if (checkNowFormStatus($link) == 'D' && checkSheJiokLeader($link, $id) == '0') { write_note($link, $id, $user_id, "設計主管提交至生管階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計提交至設計主管階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計提交至設計主管階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['designleadername'], $data['designleadermail']], - [$data['shengguanname'], $data['shengguanmail']] - ], - "永佳捷科技" - ); do_wws_next_assign(getShengGuanokLeaderNo($link), $form_key, 'E'); return; } // 確認生管階段(營業部及設計部) 結束簽核流程 if (checkNowFormStatus($link) == 'E' && checkShengGuanok($link, $id) == '0') { - write_note($link, $id, $user_id, "進入生產結案階段"); - $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-進入生產結案階段"; - $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-進入生產結案階段"; - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$data['shengguanname'], $data['shengguanmail']] - ], - "永佳捷科技" - ); + write_note($link, $id, $user_id, "進入結案階段"); do_wws_next_assign('00000', $form_key, 'Z'); return; } diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php index 2fde966b..9b9757fb 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit.php @@ -5,9 +5,8 @@ * 1. A:工務組長確認中 生管建立大日程 (或是系統洗入) * 工務:宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102) * 2. B:營業員確認中 - * 3. F:營業員主管確認中 * 3. C:設計部門確認中 (郭承瑋) - * 4. D:設計部門主管確認中 (M0019江京鴻) + * 4. D:設計部門主管確認中 (N0019江京鴻) * 5. E:生管確認中 (M0024伃廷) * 6. Z:本單結案 (00000) */ @@ -233,7 +232,6 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; $assign_status = array( 'A' => '工務確認中', 'B' => '工務部門已確認
營業部門確認中', - 'F' => '營業部門已確認
營業主管確認中', 'C' => '營業部門已確認
設計部門確認中', 'D' => '設計部門已確認
設計部門主管確認中', 'E' => '營業部門主管已確認
生管部門確認中', @@ -379,31 +377,31 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
(意匠圖) "; - // echo "申請上傳"; - // } else { - // if (in_array($row2['change_status'], ['A', 'B', 'D'])) { - // echo "
"; - // echo "客戶姓名：" . $row2['custom_name'] . "
狀態：審核中"; - // } - // if ($row2['change_status'] == 'C') { - // echo "
"; - // echo "客戶姓名：" . $row2['custom_name'] . "
狀態：已取消"; - // } - // if ($row2['change_status'] == 'Z') { - // echo "
"; - // echo "客戶姓名：" . $row2['custom_name'] . "
狀態：審核通過"; - // } - // } + $result2 = getWipwholeChangePlanningCustomerDetailsStatus($link, $id); + $row2 = mysqli_fetch_assoc($result2); + if (empty($row2['change_status'])) { + $show_tmp_arr = [ + '311', '312', '313', '314', '315', + '501', '511', '512', '513', '514', + '220', '320' + ]; + if (in_array($user_department_id, $show_tmp_arr)) + echo "
"; + echo "申請上傳"; + } else { + if (in_array($row2['change_status'], ['A', 'B', 'D'])) { + echo "
"; + echo "客戶姓名：" . $row2['custom_name'] . "
狀態：審核中"; + } + if ($row2['change_status'] == 'C') { + echo "
"; + echo "客戶姓名：" . $row2['custom_name'] . "
狀態：已取消"; + } + if ($row2['change_status'] == 'Z') { + echo "
"; + echo "客戶姓名：" . $row2['custom_name'] . "
狀態：審核通過"; + } + } ?> @@ -1257,12 +1249,12 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; @@ -1353,96 +1345,6 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; (工務助理項目) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
序號序號 系統名稱 流程名稱 接收日期
- - "> - 作番大日程-合約號: 作番號: - - - "> - - - - - "> @@ -416,9 +414,13 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 附件 - 客戶姓名:" placeholder="輸入後即可上傳附件" /> -
- + > 下載附件" : ""; ?> @@ -711,22 +713,12 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; - + - - - - 若無工勘資料請勿移交至設計階段！
QC及官檢類型 - /> - - /> - - /> - + /> + + /> + + /> +
QC及官檢類型 - /> - - /> - - /> - -
內部QC日 -
- > - - - -
- 		確認人 - -
QC合格日 -
- > - - - -
- 		確認人 - -
官檢日 -
- > - > - - - -
- 		確認人 - -
移交日 -
- > - - - -
- 		確認人 - -
發包類型 @@ -1616,84 +1518,6 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
實際安裝開工日 -
- > - - - -
- 		確認人 - -
實際安裝完工日 -
- > - - - -
- 		確認人 - -
實際試車開工日 -
- > - - - -
- 		確認人 - -
實際試車完工日 -
- > - - - -
- 		確認人 - -
備註 @@ -1732,19 +1556,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
-
-
-
-
@@ -1808,34 +1628,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; $('#renovate_type').select2(); $("#renovate_type").val(jsonData).trigger("change"); $('#site_survey_contact_verify').select2(); - checkCustomerPlanningVerifyFileKeyinStatus(); - checkDeliveryDateKeyinStatus(); }); - - function checkCustomerPlanningVerifyFileKeyinStatus() { - checkCustomerPlanningVerifyFileDisabled(); - $("#real_custom_name").keyup(function() { - checkCustomerPlanningVerifyFileDisabled(); - }); - } - - function checkCustomerPlanningVerifyFileDisabled() { - if ($("#real_custom_name").val() !== "") { - $("#customer_planning_verify_file").prop("disabled", false); - } else { - $("#customer_planning_verify_file").prop("disabled", true); - } - } - - function checkDeliveryDateKeyinStatus() { - $("#delivery_date").prop("disabled", true); - if ($("#end_qc_date").val() !== "") { - $("#delivery_date").prop("disabled", false); - } - if ($("#official_check_date").val() !== "") { - $("#delivery_date").prop("disabled", false); - } - } $(function() { var tab = $('#tab').val(); $("#tabs").tabs({ @@ -1859,15 +1652,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 'qc_date', 'end_qc_date', 'official_check_date', - 'delivery_date', - 'qc_date2', - 'end_qc_date2', - 'official_check_date2', - 'delivery_date2', - 'install_start_date2', - 'install_end_date2', - 'tryrun_start_date2', - 'tryrun_end_date2', + 'delivery_date' ] for (var i = 0; i < catchTime_input_arr.length; i++) { inputChangeCatchTime(catchTime_input_arr[i]); diff --git a/wms/wipwhole-renovate-rec-invoice.php b/wms/wipwhole-renovate-rec-invoice.php index 12f9b99a..601026c8 100644 --- a/wms/wipwhole-renovate-rec-invoice.php +++ b/wms/wipwhole-renovate-rec-invoice.php @@ -41,7 +41,6 @@ if ($department_id == "321" || $department_id == "220") { COUNT(*) FROM wipwholestatus WHERE facilityno = '$facilityno' - AND status = '1' "; $result = mysqli_query($link, $sql); $row = mysqli_fetch_array($result);