From 51d54ee0bf5d3fbe793daae0e8887e86a8107df7 Mon Sep 17 00:00:00 2001 From: 10994015 Date: Tue, 24 Oct 2023 17:44:19 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=90=88=E7=B4=84=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=87=E9=99=8D=E8=A8=AD=E5=82=99=E9=99=A4?= =?UTF-8?q?=E5=A4=96=E5=B7=A5=E7=A8=8B=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/account_log/M0174-2023-10-24.ini | 2 + wms/contract/conn.php | 2 +- wms/contract/prviewPdf.php | 101 ++++++++++++++++++++++++++- 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/wms/account_log/M0174-2023-10-24.ini b/wms/account_log/M0174-2023-10-24.ini index b0f9e222..8d0ca060 100644 --- a/wms/account_log/M0174-2023-10-24.ini +++ b/wms/account_log/M0174-2023-10-24.ini @@ -1,3 +1,5 @@ a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 11:40:03.2023-10-25 11:40:03.0fab03939c2b072ec9e4d2c39a6a1f25";}11:40:03 a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 15:47:40.2023-10-25 15:47:40.75a83416d0f079e46f15ec04d73bae7a";}15:47:40 a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 15:57:13.2023-10-25 15:57:13.2473e84fbbf94d80a557ede2a24d64c2";}15:57:13 +a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 16:34:49.2023-10-25 16:34:49.600b08892ae4dc42395439cb3c8fae1c";}16:34:49 +a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 17:29:09.2023-10-25 17:29:09.c0fd559d92f4f8aeef654187be826e41";}17:29:09 diff --git a/wms/contract/conn.php b/wms/contract/conn.php index de066d5a..b92e67e5 100644 --- a/wms/contract/conn.php +++ b/wms/contract/conn.php @@ -1,5 +1,5 @@ 甲 方 + : @@ -390,6 +391,7 @@ function removeTrailingBr($string) { 代 表 人 + :   @@ -402,6 +404,7 @@ function removeTrailingBr($string) { 一 編 號 + :   @@ -412,12 +415,13 @@ function removeTrailingBr($string) { 地 址 + :   -

 

+

 

+
@@ -425,6 +429,7 @@ function removeTrailingBr($string) {
:
@@ -437,6 +442,7 @@ function removeTrailingBr($string) { 總 經 理 + : @@ -450,6 +456,7 @@ function removeTrailingBr($string) { 一 編 號 + : @@ -461,6 +468,7 @@ function removeTrailingBr($string) { 地 址 + : @@ -477,6 +485,97 @@ function removeTrailingBr($string) { --> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
一、機械室之建造,含預留出入口、通風照明、自動閉鎖裝置,及天花板上之保養用吊鉤。
二、通往機械室之樓梯及加護欄杆工程。
三、機械室基礎台需用防濕之瀝青鐵筋混凝土及地板防塵工事。
四、機械室及升降路中間之橫樑或工字樑之安裝工程。
五、自屋外至機械室之動力及照明用配線電源開關插座,及接地線等電路工程。
六、升降路及機械室以外監視盤、電鈴、電話之配管與配線工程。
七、升降路之建造及底部之防水工程及緩衝器水泥台工程。
八、機坑照明保養用之開關及插座,鐵爬梯。
九、各樓按鈕開關之留洞工程及安裝後之固定與週邊裝飾工程。
十、升降路內甲方不得裝設有任何與升降設備無關之配線、電線配管、水管、風管等設備。
十一、安裝所需水泥、砂石、水電與供試車用動力電源。
十二、升降路及機房之建造,電源設備之容量及位置等,需符合國家標準(CNS-2866)及建築法規等規定。
十三、機械運抵工地後供給儲存倉庫。
備註:CNS-2866國家標準建築物電梯有關之法規:
1.機械室內應設有照明及通風設備,以利管理檢查,照明應在100LUX(米一燭光)以上,通風設備應能使室內溫度保持在攝氏40度以下。
2.機械室之出入口應加鎖,其裝置應良好。
3.由機械室至走廊,樓梯間應便於通行,樓梯應加裝扶手,其與水平面之傾斜角度,應不超過60度。
4.機械室出入門之構造,應有下述裝置:
+ A:能自動關閉者。
+ B:有彈簧鎖或其類似裝置,以便室內不用鎖匙,而能開門。
+ C:除屋頂開口部份以外,機械式牆壁,應能耐火。(二小時防火時效) +
5.升降路內不得設置與升降機無關之配管及配線。
6.任一升降路下部之任何部份,供人使用或類似使用時配重側比照車廂,同樣必須裝設緊急安全裝置。
7.若有火警受信總機時,甲方需提供"火警受信總機"檢出信號及通往升降道內之配管配線(0.75MM² × 3)
+
From 95f1891ff530ebdfea438e55771128ca085434cb Mon Sep 17 00:00:00 2001 From: 10994015 Date: Wed, 25 Oct 2023 17:53:14 +0800 Subject: [PATCH 02/20] =?UTF-8?q?1025=E5=90=88=E7=B4=84=E6=9B=B8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asdas.txt | 1 + wms/contract/contract-download.php | 16 ++++-- wms/contract/export-pdf.php | 18 ++++--- wms/contract/js/alpine.js | 8 ++- wms/contract/prviewPdf.php | 85 ++++++++++++++++-------------- wms/mkt/pricereview-index.php | 2 +- 6 files changed, 76 insertions(+), 54 deletions(-) create mode 100644 asdas.txt diff --git a/asdas.txt b/asdas.txt new file mode 100644 index 00000000..8e08f3b8 --- /dev/null +++ b/asdas.txt @@ -0,0 +1 @@ +sdasd \ No newline at end of file diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php index 8de9dfd0..6cd8e7d9 100644 --- a/wms/contract/contract-download.php +++ b/wms/contract/contract-download.php @@ -16,7 +16,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){ $stmt->execute(); $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC); $contract = $contracts[0]; - if($contract['status'] !== "YY"){ + if(($contract['status'] !== "YY" && $user_id != 'M0107') && $user_id != 'M0174'){ echo '
關閉分頁 + + 立約人 + + + + 營業員 + + + + 合約開始時間 + + + + 合約終止時間 + + + + 合約總價 @@ -264,66 +360,97 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); - 立約人 + 保養別 - + - 營業員 + 竣檢日 - + + 許可證有效時間 + + + + + 電梯數量 + + + + + + + 規格 + + - 合約開始時間 + 載重 - + - 合約終止時間 + 速度 - + + + + 人乘 + + - 地址 + 樓停 + + + + 樓層 + + + + 緯度 + + + + + 經度 + + + + + + 區域 + + + + 詳細地址 - 附件 - - - + diff --git a/wms/contract/twzip.json b/wms/contract/twzip.json new file mode 100644 index 00000000..47b34e0a --- /dev/null +++ b/wms/contract/twzip.json @@ -0,0 +1,514 @@ +{ + "cities": [ + { + "name": "台北市", + "code": 100, + "region": [ + { "name": "中山區", "code": 104 }, + { "name": "大安區", "code": 106 }, + { "name": "信義區", "code": 110 }, + { "name": "內湖區", "code": 114 }, + { "name": "士林區", "code": 111 }, + { "name": "中正區", "code": 100 }, + { "name": "松山區", "code": 105 }, + { "name": "北投區", "code": 112 }, + { "name": "大同區", "code": 103 }, + { "name": "文山區", "code": 116 }, + { "name": "南港區", "code": 115 }, + { "name": "萬華區", "code": 108 } + ] + }, + { + "name": "新北市", + "code": 207, + "region": [ + { "name": "板橋區", "code": 220 }, + { "name": "新莊區", "code": 242 }, + { "name": "中和區", "code": 235 }, + { "name": "永和區", "code": 234 }, + { "name": "淡水區", "code": 251 }, + { "name": "三重區", "code": 241 }, + { "name": "汐止區", "code": 221 }, + + { "name": "新店區", "code": 231 }, + { "name": "土城區", "code": 236 }, + { "name": "蘆洲區", "code": 247 }, + { "name": "三峽區", "code": 237 }, + { "name": "樹林區", "code": 238 }, + { "name": "鶯歌區", "code": 239 }, + { "name": "林口區", "code": 244 }, + { "name": "五股區", "code": 248 }, + + { "name": "泰山區", "code": 243 }, + { "name": "八里區", "code": 249 }, + { "name": "三芝區", "code": 252 }, + { "name": "萬里區", "code": 207 }, + { "name": "金山區", "code": 208 }, + { "name": "石門區", "code": 253 }, + { "name": "深坑區", "code": 222 }, + { "name": "石碇區", "code": 223 }, + { "name": "瑞芳區", "code": 224 }, + { "name": "平溪區", "code": 226 }, + { "name": "雙溪區", "code": 227 }, + { "name": "貢寮區", "code": 228 }, + { "name": "坪林區", "code": 232 }, + { "name": "烏來區", "code": 233 } + ] + }, + { + "name": "桃園市", + "code": 320, + "region": [ + { "name": "中壢區", "code": 320 }, + { "name": "平鎮區", "code": 324 }, + { "name": "楊梅區", "code": 326 }, + { "name": "桃園區", "code": 330 }, + { "name": "龜山區", "code": 333 }, + { "name": "八德區", "code": 334 }, + { "name": "蘆竹區", "code": 338 }, + + { "name": "大園區", "code": 337 }, + { "name": "龍潭區", "code": 325 }, + { "name": "新屋區", "code": 327 }, + { "name": "觀音區", "code": 328 }, + { "name": "大溪區", "code": 335 }, + { "name": "復興區", "code": 336 } + ] + }, + { + "name": "新竹市", + "code": 300, + "region": [ + { "name": "東區", "code": 30069 }, + { "name": "北區", "code": 30042 }, + { "name": "香山區", "code": 30093 } + ] + }, + { + "name": "新竹縣", + "code": 302, + "region": [ + { "name": "竹北市", "code": 302 }, + { "name": "湖口鄉", "code": 303 }, + { "name": "新豐鄉", "code": 304 }, + { "name": "新埔鎮", "code": 305 }, + { "name": "關西鎮", "code": 306 }, + { "name": "芎林鄉", "code": 307 }, + { "name": "寶山鄉", "code": 308 }, + { "name": "竹東鎮", "code": 310 }, + { "name": "五峰鄉", "code": 311 }, + { "name": "橫山鄉", "code": 312 }, + { "name": "尖石鄉", "code": 313 }, + { "name": "北埔鄉", "code": 314 }, + { "name": "峨嵋鄉", "code": 315 } + ] + }, + { + "name": "基隆市", + "code": 200, + "region": [ + { "name": "仁愛區", "code": 200 }, + { "name": "信義區", "code": 201 }, + { "name": "中正區", "code": 202 }, + { "name": "中山區", "code": 203 }, + { "name": "安樂區", "code": 204 }, + { "name": "暖暖區", "code": 205 }, + { "name": "七堵區", "code": 206 } + ] + }, + { + "name": "宜蘭縣", + "code": 260, + "region": [ + { "name": "宜蘭市", "code": 260 }, + { "name": "頭城鎮", "code": 261 }, + { "name": "礁溪鄉", "code": 262 }, + { "name": "壯圍鄉", "code": 263 }, + { "name": "員山鄉", "code": 264 }, + { "name": "羅東鎮", "code": 265 }, + { "name": "三星鄉", "code": 266 }, + { "name": "大同鄉", "code": 267 }, + { "name": "五結鄉", "code": 268 }, + { "name": "冬山鄉", "code": 269 }, + { "name": "蘇澳鎮", "code": 270 }, + { "name": "南澳鄉", "code": 272 } + ] + }, + { + "name": "台中市", + "code": 400, + "region": [ + { "name": "西屯區", "code": 407 }, + { "name": "北區", "code": 404 }, + { "name": "北屯區", "code": 406 }, + { "name": "西區", "code": 403 }, + { "name": "南區", "code": 402 }, + { "name": "南屯區", "code": 408 }, + { "name": "大里區", "code": 412 }, + + { "name": "中區", "code": 400 }, + { "name": "東區", "code": 401 }, + { "name": "太平區", "code": 411 }, + { "name": "沙鹿區", "code": 433 }, + { "name": "龍井區", "code": 434 }, + { "name": "豐原區", "code": 420 }, + { "name": "潭子區", "code": 427 }, + { "name": "大雅區", "code": 428 }, + + { "name": "霧峰區", "code": 413 }, + { "name": "烏日區", "code": 414 }, + { "name": "后里區", "code": 421 }, + { "name": "石岡區", "code": 422 }, + { "name": "東勢區", "code": 423 }, + { "name": "和平區", "code": 424 }, + { "name": "新社區", "code": 426 }, + { "name": "神岡區", "code": 429 }, + { "name": "大肚區", "code": 432 }, + { "name": "梧棲區", "code": 435 }, + { "name": "清水區", "code": 436 }, + { "name": "大甲區", "code": 437 }, + { "name": "外埔區", "code": 438 }, + { "name": "大安區", "code": 439 } + ] + }, + { + "name": "彰化縣", + "code": 500, + "region": [ + { "name": "彰化市", "code": 500 }, + { "name": "員林鎮", "code": 510 }, + { "name": "鹿港鎮", "code": 505 }, + { "name": "和美鎮", "code": 508 }, + { "name": "大村鄉", "code": 515 }, + { "name": "北斗鎮", "code": 521 }, + { "name": "溪湖鎮", "code": 514 }, + + { "name": "芬園鄉", "code": 502 }, + { "name": "花壇鄉", "code": 503 }, + { "name": "秀水鄉", "code": 504 }, + { "name": "福興鄉", "code": 506 }, + { "name": "線西鄉", "code": 507 }, + { "name": "伸港鄉", "code": 509 }, + { "name": "社頭鄉", "code": 511 }, + { "name": "永靖鄉", "code": 512 }, + { "name": "埔心鄉", "code": 513 }, + { "name": "埔鹽鄉", "code": 516 }, + { "name": "田中鎮", "code": 520 }, + { "name": "田尾鄉", "code": 522 }, + { "name": "埤頭鄉", "code": 523 }, + { "name": "溪州鄉", "code": 524 }, + { "name": "竹塘鄉", "code": 525 }, + { "name": "二林鎮", "code": 526 }, + { "name": "大城鄉", "code": 527 }, + { "name": "芳苑鄉", "code": 528 }, + { "name": "二水鄉", "code": 530 } + ] + }, + { + "name": "雲林縣", + "code": 630, + "region": [ + { "name": "斗南鎮", "code": 630 }, + { "name": "大埤鄉", "code": 631 }, + { "name": "虎尾鎮", "code": 632 }, + { "name": "土庫鎮", "code": 633 }, + { "name": "褒忠鄉", "code": 634 }, + { "name": "東勢鄉", "code": 635 }, + { "name": "臺西鄉", "code": 636 }, + { "name": "崙背鄉", "code": 637 }, + { "name": "麥寮鄉", "code": 638 }, + { "name": "斗六市", "code": 640 }, + { "name": "林內鄉", "code": 643 }, + { "name": "古坑鄉", "code": 646 }, + { "name": "莿桐鄉", "code": 647 }, + { "name": "西螺鎮", "code": 648 }, + { "name": "二崙鄉", "code": 649 }, + { "name": "北港鎮", "code": 651 }, + { "name": "水林鄉", "code": 652 }, + { "name": "口湖鄉", "code": 653 }, + { "name": "四湖鄉", "code": 654 }, + { "name": "元長鄉", "code": 655 } + ] + }, + { + "name": "苗栗縣", + "code": 350, + "region": [ + { "name": "竹南鎮", "code": 350 }, + { "name": "頭份鎮", "code": 351 }, + { "name": "三灣鄉", "code": 352 }, + { "name": "南莊鄉", "code": 353 }, + { "name": "獅潭鄉", "code": 354 }, + { "name": "後龍鎮", "code": 356 }, + { "name": "通霄鎮", "code": 357 }, + { "name": "苑裡鎮", "code": 358 }, + { "name": "苗栗市", "code": 360 }, + { "name": "造橋鄉", "code": 361 }, + { "name": "頭屋鄉", "code": 362 }, + { "name": "公館鄉", "code": 363 }, + { "name": "大湖鄉", "code": 364 }, + { "name": "泰安鄉", "code": 365 }, + { "name": "銅鑼鄉", "code": 366 }, + { "name": "三義鄉", "code": 367 }, + { "name": "西湖鄉", "code": 368 }, + { "name": "卓蘭鎮", "code": 369 } + ] + }, + { + "name": "南投縣", + "code": 540, + "region": [ + { "name": "南投市", "code": 540 }, + { "name": "中寮鄉", "code": 541 }, + { "name": "草屯鎮", "code": 542 }, + { "name": "國姓鄉", "code": 544 }, + { "name": "埔里鎮", "code": 545 }, + { "name": "仁愛鄉", "code": 546 }, + { "name": "名間鄉", "code": 551 }, + { "name": "集集鎮", "code": 552 }, + { "name": "水里鄉", "code": 553 }, + { "name": "魚池鄉", "code": 555 }, + { "name": "信義鄉", "code": 556 }, + { "name": "竹山鎮", "code": 557 }, + { "name": "鹿谷鄉", "code": 558 } + ] + }, + { + "name": "台南市", + "code": 700, + "region": [ + { "name": "東區", "code": 701 }, + { "name": "北區", "code": 704 }, + { "name": "永康區", "code": 710 }, + { "name": "中西區", "code": 700 }, + { "name": "善化區", "code": 741 }, + { "name": "新市區", "code": 744 }, + { "name": "安平區", "code": 708 }, + + { "name": "南區", "code": 702 }, + { "name": "安南區", "code": 709 }, + { "name": "仁德區", "code": 717 }, + { "name": "新營區", "code": 730 }, + { "name": "安定區", "code": 745 }, + { "name": "麻豆區", "code": 721 }, + { "name": "佳里區", "code": 722 }, + { "name": "歸仁區", "code": 711 }, + { "name": "新化區", "code": 712 }, + + { "name": "左鎮區", "code": 713 }, + { "name": "玉井區", "code": 714 }, + { "name": "楠西區", "code": 715 }, + { "name": "南化區", "code": 716 }, + { "name": "關廟區", "code": 718 }, + { "name": "龍崎區", "code": 719 }, + { "name": "官田區", "code": 720 }, + { "name": "西港區", "code": 723 }, + { "name": "七股區", "code": 724 }, + { "name": "將軍區", "code": 725 }, + { "name": "學甲區", "code": 726 }, + { "name": "北門區", "code": 727 }, + { "name": "後壁區", "code": 731 }, + { "name": "白河區", "code": 732 }, + { "name": "東山區", "code": 733 }, + { "name": "六甲區", "code": 734 }, + { "name": "下營區", "code": 735 }, + { "name": "柳營區", "code": 736 }, + { "name": "鹽水區", "code": 737 }, + { "name": "大內區", "code": 742 }, + { "name": "山上區", "code": 743 } + ] + }, + { + "name": "高雄市", + "code": 800, + "region": [ + { "name": "三民區", "code": 807 }, + { "name": "左營區", "code": 813 }, + { "name": "苓雅區", "code": 802 }, + { "name": "鼓山區", "code": 804 }, + { "name": "楠梓區", "code": 811 }, + { "name": "前鎮區", "code": 806 }, + { "name": "鳳山區", "code": 830 }, + + { "name": "新興區", "code": 800 }, + { "name": "前金區", "code": 801 }, + { "name": "小港區", "code": 812 }, + { "name": "大寮區", "code": 831 }, + { "name": "岡山區", "code": 820 }, + { "name": "鹽埕區", "code": 803 }, + { "name": "仁武區", "code": 814 }, + { "name": "大社區", "code": 815 }, + + { "name": "旗津區", "code": 805 }, + { "name": "路竹區", "code": 821 }, + { "name": "阿蓮區", "code": 822 }, + { "name": "田寮區", "code": 823 }, + { "name": "燕巢區", "code": 824 }, + { "name": "橋頭區", "code": 825 }, + { "name": "梓官區", "code": 826 }, + { "name": "彌陀區", "code": 827 }, + { "name": "永安區", "code": 828 }, + { "name": "湖內區", "code": 829 }, + { "name": "林園區", "code": 832 }, + { "name": "鳥松區", "code": 833 }, + { "name": "大樹區", "code": 840 }, + { "name": "旗山區", "code": 842 }, + { "name": "美濃區", "code": 843 }, + { "name": "六龜區", "code": 844 }, + { "name": "內門區", "code": 845 }, + { "name": "杉林區", "code": 846 }, + { "name": "甲仙區", "code": 847 }, + { "name": "桃源區", "code": 848 }, + { "name": "那瑪夏區", "code": 849 }, + { "name": "茂林區", "code": 851 }, + { "name": "茄萣區", "code": 852 } + ] + }, + { + "name": "嘉義市", + "code": 600, + "region": [ + { "name": "東區", "code": 60070 }, + { "name": "西區", "code": 60085 } + ] + }, + { + "name": "嘉義縣", + "code": 602, + "region": [ + { "name": "番路鄉", "code": 602 }, + { "name": "梅山鄉", "code": 603 }, + { "name": "竹崎鄉", "code": 604 }, + { "name": "阿里山", "code": 605 }, + { "name": "中埔鄉", "code": 606 }, + { "name": "大埔鄉", "code": 607 }, + { "name": "水上鄉", "code": 608 }, + { "name": "鹿草鄉", "code": 611 }, + { "name": "太保市", "code": 612 }, + { "name": "朴子市", "code": 613 }, + { "name": "東石鄉", "code": 614 }, + { "name": "六腳鄉", "code": 615 }, + { "name": "新港鄉", "code": 616 }, + { "name": "民雄鄉", "code": 621 }, + { "name": "大林鎮", "code": 622 }, + { "name": "溪口鄉", "code": 623 }, + { "name": "義竹鄉", "code": 624 }, + { "name": "布袋鎮", "code": 625 } + ] + }, + { + "name": "屏東縣", + "code": 900, + "region": [ + { "name": "屏東市", "code": 900 }, + { "name": "三地門", "code": 901 }, + { "name": "霧臺鄉", "code": 902 }, + { "name": "瑪家鄉", "code": 903 }, + { "name": "九如鄉", "code": 904 }, + { "name": "里港鄉", "code": 905 }, + { "name": "高樹鄉", "code": 906 }, + { "name": "鹽埔鄉", "code": 907 }, + { "name": "長治鄉", "code": 908 }, + { "name": "麟洛鄉", "code": 909 }, + { "name": "竹田鄉", "code": 911 }, + { "name": "內埔鄉", "code": 912 }, + { "name": "萬丹鄉", "code": 913 }, + { "name": "潮州鎮", "code": 920 }, + { "name": "泰武鄉", "code": 921 }, + { "name": "來義鄉", "code": 922 }, + { "name": "萬巒鄉", "code": 923 }, + { "name": "崁頂鄉", "code": 924 }, + { "name": "新埤鄉", "code": 925 }, + { "name": "南州鄉", "code": 926 }, + { "name": "林邊鄉", "code": 927 }, + { "name": "東港鎮", "code": 928 }, + { "name": "琉球鄉", "code": 929 }, + { "name": "佳冬鄉", "code": 931 }, + { "name": "新園鄉", "code": 932 }, + { "name": "枋寮鄉", "code": 940 }, + { "name": "枋山鄉", "code": 941 }, + { "name": "春日鄉", "code": 942 }, + { "name": "獅子鄉", "code": 943 }, + { "name": "車城鄉", "code": 944 }, + { "name": "牡丹鄉", "code": 945 }, + { "name": "恆春鎮", "code": 946 }, + { "name": "滿州鄉", "code": 947 } + ] + }, + { + "name": "台東縣", + "code": 950, + "region": [ + { "name": "臺東市", "code": 950 }, + { "name": "綠島鄉", "code": 951 }, + { "name": "蘭嶼鄉", "code": 952 }, + { "name": "延平鄉", "code": 953 }, + { "name": "卑南鄉", "code": 954 }, + { "name": "鹿野鄉", "code": 955 }, + { "name": "關山鎮", "code": 956 }, + { "name": "海端鄉", "code": 957 }, + { "name": "池上鄉", "code": 958 }, + { "name": "東河鄉", "code": 959 }, + { "name": "成功鎮", "code": 961 }, + { "name": "長濱鄉", "code": 962 }, + { "name": "太麻里鄉", "code": 963 }, + { "name": "金峰鄉", "code": 964 }, + { "name": "大武鄉", "code": 965 }, + { "name": "達仁鄉", "code": 966 } + ] + }, + { + "name": "花蓮縣", + "code": 970, + "region": [ + { "name": "花蓮市", "code": 970 }, + { "name": "新城鄉", "code": 971 }, + { "name": "秀林鄉", "code": 972 }, + { "name": "吉安鄉", "code": 973 }, + { "name": "壽豐鄉", "code": 974 }, + { "name": "鳳林鎮", "code": 975 }, + { "name": "光復鄉", "code": 976 }, + { "name": "豐濱鄉", "code": 977 }, + { "name": "瑞穗鄉", "code": 978 }, + { "name": "萬榮鄉", "code": 979 }, + { "name": "玉里鎮", "code": 981 }, + { "name": "卓溪鄉", "code": 982 }, + { "name": "富里鄉", "code": 983 } + ] + }, + { + "name": "澎湖縣", + "code": 880, + "region": [ + { "name": "馬公市", "code": 880 }, + { "name": "西嶼鄉", "code": 881 }, + { "name": "望安鄉", "code": 882 }, + { "name": "七美鄉", "code": 883 }, + { "name": "白沙鄉", "code": 884 }, + { "name": "湖西鄉", "code": 885 } + ] + }, + { + "name": "金門縣", + "code": 890, + "region": [ + { "name": "金沙鎮", "code": 890 }, + { "name": "金湖鎮", "code": 891 }, + { "name": "金寧鄉", "code": 892 }, + { "name": "金城鎮", "code": 893 }, + { "name": "烈嶼鄉", "code": 894 }, + { "name": "烏坵鄉", "code": 896 } + ] + }, + { + "name": "連江縣", + "code": 209, + "region": [ + { "name": "南竿鄉", "code": 209 }, + { "name": "北竿鄉", "code": 210 }, + { "name": "莒光鄉", "code": 211 }, + { "name": "東引鄉", "code": 212 } + ] + } + ] + } \ No newline at end of file From ccc89c52d795b4fcb8e54076b036b38a91ca92b7 Mon Sep 17 00:00:00 2001 From: 10994015 Date: Mon, 6 Nov 2023 09:13:29 +0800 Subject: [PATCH 09/20] 1116 --- wms/contract/contract-input.php | 72 +-------------------------------- 1 file changed, 1 insertion(+), 71 deletions(-) diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php index 361ae9ba..e098a317 100644 --- a/wms/contract/contract-input.php +++ b/wms/contract/contract-input.php @@ -13,18 +13,6 @@ $stmt = $conn->prepare($sql_str); $stmt->bindParam(':accounttype',$accounttype); $stmt->execute(); $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); -$accounttype = "B"; -$sql_str = "SELECT accountid, name FROM account WHERE accounttype = :accounttype"; -$stmt = $conn->prepare($sql_str); -$stmt->bindParam(':accounttype',$accounttype); -$stmt->execute(); -$workers = $stmt->fetchAll(PDO::FETCH_ASSOC); -$accounttype = "M"; -$sql_str = "SELECT id,accountid, name FROM account WHERE accounttype = :accounttype"; -$stmt = $conn->prepare($sql_str); -$stmt->bindParam(':accounttype',$accounttype); -$stmt->execute(); -$contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); ?> @@ -172,7 +160,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); this.data.numberoffloor = '' this.data.speed = '' this.data.takecertificatedate = '' - this.data.step = 1 + this.step = 1 }, save(){ this.isLoading = true @@ -257,25 +245,6 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); -
- - -
makeTFacilityNo("T", 'X', 5); isLoading:false, fail_arr:[], nextStepFn(){ - if(this.data.contractno == '') return alert('請輸入合約號'); - this.isLoading = true - axios.get('./api/getContractData.php?contractno=' + this.data.contractno).then(res=>{ - console.log(res) - - if(!this.customize){ - this.data.total_price = res.data.sold_price - this.data.salesman = res.data.salesman - this.data.contract_begin_date = res.data.contract_begin_date - this.data.contract_end_date = res.data.contract_end_date - this.data.address = res.data.address - this.data.customer = res.data.customer - this.data.partyA = res.data.customer - this.data.partyAaddress = res.data.address - this.data.spec = res.data.spec - this.data.weight = res.data.weight - this.data.numberofpassenger = res.data.persons - this.data.numberofstop = res.data.stop - this.data.numberoffloor = res.data.floors - this.data.speed = res.data.speed - this.data.takecertificatedate = res.data.contract_begin_date - let cityIndex = this.data.address.indexOf('市'); - if (cityIndex > 1) { - // 獲取''市''前面的兩個字 - let city = this.data.address.substring(cityIndex - 2, cityIndex + 1); - this.data.area = city; - console.log(this.data.area); - } else { - this.data.area = '' - console.log('沒有找到或者格式不正確'); - } - } - this.step = 2 - this.isLoading = false - }).catch(err=>{ - console.error(err) - this.isLoading = false - }) + if(this.step==1){ + if(this.data.contractno == '') return alert('請輸入合約號'); + this.isLoading = true + this.getContractDate(); + }else if(this.step == 2){ + this.step = 3 + } }, nextStepKeyupFn(e){ if(e.keyCode !== 13) return - if(this.contractno == '') return alert('請輸入合約號'); - this.isLoading = true + if(this.step==1){ + if(this.data.contractno == '') return alert('請輸入合約號'); + this.isLoading = true + this.getContractDate(); + }else if(this.step == 2){ + this.step = 3 + } + }, + getContractDate(){ axios.get('./api/getContractData.php?contractno=' + this.data.contractno).then(res=>{ - console.log(res) if(!this.customize){ + console.log(res.data); this.data.total_price = res.data.sold_price this.data.salesman = res.data.salesman this.data.contract_begin_date = res.data.contract_begin_date @@ -139,10 +115,8 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); // 獲取''市''前面的兩個字 let city = this.data.address.substring(cityIndex - 2, cityIndex + 1); this.data.area = city; - console.log(this.data.area); } else { this.data.area = '' - console.log('沒有找到或者格式不正確'); } } this.step = 2 @@ -153,22 +127,30 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); }) }, preStepFn(){ - this.data.total_price = '' - this.data.salesman = '' - this.data.contract_begin_date = '' - this.data.contract_end_date = '' - this.data.address = '' - this.data.customer = '' - this.data.partyA = '' - this.data.partyAaddress = '' - this.data.spec = '' - this.data.weight = '' - this.data.numberofpassenger = '' - this.data.numberofstop = '' - this.data.numberoffloor = '' - this.data.speed = '' - this.data.takecertificatedate = '' - this.step = 1 + if(this.step==2){ + if(confirm('回到上一頁會將本頁資料清空,確定返回嗎?')){ + this.step = 1 + this.data.total_price = '' + this.data.salesman = '' + this.data.contract_begin_date = '' + this.data.contract_end_date = '' + this.data.address = '' + this.data.customer = '' + this.data.partyA = '' + this.data.partyAaddress = '' + this.data.spec = '' + this.data.weight = '' + this.data.numberofpassenger = '' + this.data.numberofstop = '' + this.data.numberoffloor = '' + this.data.speed = '' + this.data.takecertificatedate = '' + this.step = 1 + return; + } + }else if(this.step == 3){ + this.step = 2 + } }, save(){ this.isLoading = true @@ -233,7 +215,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); }, uploadFiles(e){ this.data.files = e.target.files - } + }, }">
@@ -282,7 +264,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); 營業員 - @@ -302,10 +284,10 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); - 合約總價 + 電梯台數 - -

未填寫

+ +

未填寫

統一編號/身分證 @@ -393,6 +375,28 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);

未填寫

+ + 廠牌 + + +

未填寫

+ + 區域 + + +

未填寫

+ + 詳細地址 + + +

未填寫

+ + 保養別 @@ -414,16 +418,21 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);

未填寫

- - 電梯數量 - - -

未填寫

+ 附件 + + +

未填寫

- - 規格 + + + + + - - - -