diff --git a/wms/mkt/assets/js/pricereviewAlpine.js b/wms/mkt/assets/js/pricereviewAlpine.js index 9a1f0c2d..b8af842a 100644 --- a/wms/mkt/assets/js/pricereviewAlpine.js +++ b/wms/mkt/assets/js/pricereviewAlpine.js @@ -89,6 +89,8 @@ const pricereviewCreate = () => { uscc: uscc, person: salesman, }, + attatch1:"", + attatch2:"", weightArr: { 6: 450, 8: 550, @@ -141,13 +143,15 @@ const pricereviewCreate = () => { model = this.modalElevatorInfo.spec + '-' + this.modalElevatorInfo.person + '*' + this.modalElevatorInfo.stop + '-' + this.modalElevatorInfo.open + this.modalElevatorInfo.speed; this.modalElevatorInfo.model = this.modalElevatorInfo.spec + '-' + this.modalElevatorInfo.person + '*' + this.modalElevatorInfo.stop + '-' + this.modalElevatorInfo.open + this.modalElevatorInfo.speed; } + console.log(model); try{ const res = await axios.get("./api/getElevatorPrice.php", {params: {model: model, kind:kind}}) console.log(res.data); if (res.data == null || res.data == "") { console.log("公司並無提供此規格!!"); } - this.modalElevatorInfo.price = res.data + this.modalElevatorInfo.price = res.data.price + this.modalElevatorInfo.id = res.data.id } catch (error) { console.error("Error fetching elevator price:", error); } @@ -764,7 +768,7 @@ const pricereviewCreate = () => { return total; }, error: [], - submit(){ + validation(){ this.error = [] for(let i=0;i { alert(errortext) return; } - + }, + submit(){ + this.validation(); + const form = new FormData(); form.append('contractno', contractno); form.append('ekind', (is_renovation=="Y") ? "汰改" : "新梯"); @@ -848,6 +855,9 @@ const pricereviewCreate = () => { }) }, save(){ + console.log(this.attatch1); + return; + this.validation(); const form = new FormData(); form.append('contractno', contractno); form.append('ekind', (is_renovation=="Y") ? "汰改" : "新梯"); diff --git a/wms/mkt/css/pricereview.css b/wms/mkt/css/pricereview.css index a69bdd56..7c0bafd4 100644 --- a/wms/mkt/css/pricereview.css +++ b/wms/mkt/css/pricereview.css @@ -3,36 +3,29 @@ #pricereviewCreate select { margin: 1px; } - #pricereviewCreate textarea { resize: vertical; } - -#pricereviewCreate>.modal { +#pricereviewCreate > .modal { padding: 20px; } - -#pricereviewCreate>.modal table, -#pricereviewCreate>.modal th, -#pricereviewCreate>.modal td { +#pricereviewCreate > .modal table, +#pricereviewCreate > .modal th, +#pricereviewCreate > .modal td { border: 1px #ccc solid; } - -#pricereviewCreate>.modal table>thead tr th { +#pricereviewCreate > .modal table > thead tr th { color: #A52A2A; } - -#pricereviewCreate>.modal table>tbody .selected { +#pricereviewCreate > .modal table > tbody .selected { background-color: #E7FEFB; } - #pricereviewCreate .container table, #pricereviewCreate .container th, #pricereviewCreate .container td { border: 1px #ccc solid; padding: 15px; } - #pricereviewCreate .container table.noborder, #pricereviewCreate .container table .noborder th, #pricereviewCreate .container table .noborder td, @@ -44,15 +37,12 @@ #pricereviewCreate .container td .noborder td { border: none; } - #pricereviewCreate .container table thead th { background-color: #6D9EEB; } - #pricereviewCreate .container table tbody td input { font-size: 14px; } - #pricereviewCreate .container table tbody th { background-color: #CCE4F8; font-size: 14px; @@ -60,18 +50,15 @@ min-width: 100px; text-align: center; } - #pricereviewCreate .container table input { font-size: 13px; } - #pricereviewCreate .container .pricreviewmain { background-color: #F2F2F2; padding: 20px; border-radius: 6px; margin: 30px 0; } - #pricereviewCreate .container .pricreviewmain button { color: #fff; width: 55px; @@ -81,89 +68,73 @@ margin-bottom: 2px; font-size: 13px; } - #pricereviewCreate .container .pricreviewmain button.addbtn { background-color: #337AB7; width: 30px; } - #pricereviewCreate .container .pricreviewmain button.deleteBtn { background-color: #D9534F; color: #fff; font-size: 12px; width: 30px; } - #pricereviewCreate .container .pricreviewmain button.selectElevator { background-color: #D9534F; color: #fff; } - -#pricereviewCreate .container .pricreviewmain>.divitem { +#pricereviewCreate .container .pricreviewmain > .divitem { border: 1px #ccc solid; padding: 10px; border-radius: 4px; } - -#pricereviewCreate .container .pricreviewmain>.divitem .title { +#pricereviewCreate .container .pricreviewmain > .divitem .title { display: flex; align-items: center; border-bottom: 1px #ccc solid; padding: 10px 0; margin-bottom: 10px; } - -#pricereviewCreate .container .pricreviewmain>.divitem .title h6 { +#pricereviewCreate .container .pricreviewmain > .divitem .title h6 { font-weight: 600; } - -#pricereviewCreate .container .pricreviewmain>.divitem table, -#pricereviewCreate .container .pricreviewmain>.divitem th, -#pricereviewCreate .container .pricreviewmain>.divitem td { +#pricereviewCreate .container .pricreviewmain > .divitem table, +#pricereviewCreate .container .pricreviewmain > .divitem th, +#pricereviewCreate .container .pricreviewmain > .divitem td { font-size: 14px; background-color: transparent; } - -#pricereviewCreate .container .pricreviewmain>.divitem table input, -#pricereviewCreate .container .pricreviewmain>.divitem table select, -#pricereviewCreate .container .pricreviewmain>.divitem table textarea, -#pricereviewCreate .container .pricreviewmain>.divitem th input, -#pricereviewCreate .container .pricreviewmain>.divitem th select, -#pricereviewCreate .container .pricreviewmain>.divitem th textarea, -#pricereviewCreate .container .pricreviewmain>.divitem td input, -#pricereviewCreate .container .pricreviewmain>.divitem td select, -#pricereviewCreate .container .pricreviewmain>.divitem td textarea { +#pricereviewCreate .container .pricreviewmain > .divitem table input, +#pricereviewCreate .container .pricreviewmain > .divitem table select, +#pricereviewCreate .container .pricreviewmain > .divitem table textarea, +#pricereviewCreate .container .pricreviewmain > .divitem th input, +#pricereviewCreate .container .pricreviewmain > .divitem th select, +#pricereviewCreate .container .pricreviewmain > .divitem th textarea, +#pricereviewCreate .container .pricreviewmain > .divitem td input, +#pricereviewCreate .container .pricreviewmain > .divitem td select, +#pricereviewCreate .container .pricreviewmain > .divitem td textarea { font-size: 13px; } - -#pricereviewCreate .container .pricreviewmain>.divitem table input[type=number]::-webkit-outer-spin-button, -#pricereviewCreate .container .pricreviewmain>.divitem table input[type=number]::-webkit-inner-spin-button, -#pricereviewCreate .container .pricreviewmain>.divitem th input[type=number]::-webkit-outer-spin-button, -#pricereviewCreate .container .pricreviewmain>.divitem th input[type=number]::-webkit-inner-spin-button, -#pricereviewCreate .container .pricreviewmain>.divitem td input[type=number]::-webkit-outer-spin-button, -#pricereviewCreate .container .pricreviewmain>.divitem td input[type=number]::-webkit-inner-spin-button { +#pricereviewCreate .container .pricreviewmain > .divitem table input[type=number]::-webkit-outer-spin-button, +#pricereviewCreate .container .pricreviewmain > .divitem table input[type=number]::-webkit-inner-spin-button, +#pricereviewCreate .container .pricreviewmain > .divitem th input[type=number]::-webkit-outer-spin-button, +#pricereviewCreate .container .pricreviewmain > .divitem th input[type=number]::-webkit-inner-spin-button, +#pricereviewCreate .container .pricreviewmain > .divitem td input[type=number]::-webkit-outer-spin-button, +#pricereviewCreate .container .pricreviewmain > .divitem td input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; } - -#pricereviewCreate .container .pricreviewmain>.divitem table tr:hover .deleteBtn, -#pricereviewCreate .container .pricreviewmain>.divitem table tr:hover .copyBtn { +#pricereviewCreate .container .pricreviewmain > .divitem table tr:hover .deleteBtn, +#pricereviewCreate .container .pricreviewmain > .divitem table tr:hover .copyBtn { opacity: 1; } -<<<<<<< HEAD #pricereviewCreate .container .pricreviewmain > .divitem table .copyBtn { width: 30px; height: 30px; } #pricereviewCreate .container .pricreviewmain > .divitem table .saletd { -======= - -#pricereviewCreate .container .pricreviewmain>.divitem table .saletd { ->>>>>>> 3ca7276d197f3d77f11e3719294215e04a32dc62 position: relative; } - -#pricereviewCreate .container .pricreviewmain>.divitem table .saletd>.deleteBtn { +#pricereviewCreate .container .pricreviewmain > .divitem table .saletd > .deleteBtn { position: absolute; top: 50%; transform: translateY(-50%); @@ -171,8 +142,7 @@ opacity: 0; transition: 0.3s; } - -#pricereviewCreate .container .pricreviewmain>.divitem table .saletd>.copyBtn { +#pricereviewCreate .container .pricreviewmain > .divitem table .saletd > .copyBtn { position: absolute; top: 50%; transform: translateY(-50%); @@ -182,35 +152,29 @@ width: 30px; height: 30px; } - -#pricereviewCreate .container .pricreviewmain>.divitem table textarea { +#pricereviewCreate .container .pricreviewmain > .divitem table textarea { height: auto; min-height: 50px; } - -#pricereviewCreate .container .pricreviewmain>.filediv { +#pricereviewCreate .container .pricreviewmain > .filediv { display: flex; flex-direction: column; margin-top: 20px; } - -#pricereviewCreate .container .pricreviewmain>.filediv label { +#pricereviewCreate .container .pricreviewmain > .filediv label { display: flex; align-items: center; margin: 10px 0; } - -#pricereviewCreate .container .pricreviewmain>.filediv label p { +#pricereviewCreate .container .pricreviewmain > .filediv label p { width: 100px; font-size: 15px; font-weight: 600; } - -#pricereviewCreate .container .pricreviewmain>.filediv label input[type=file] { +#pricereviewCreate .container .pricreviewmain > .filediv label input[type=file] { width: 400px; } - -#pricereviewCreate .container .pricreviewmain>.filediv label button { +#pricereviewCreate .container .pricreviewmain > .filediv label button { width: 90px; height: 35px; margin: 0; @@ -223,12 +187,10 @@ max-width: 1400px !important; width: 100%; } - .container-fluid h4, .container h4 { font-weight: 600; } - .container-fluid .btn-secondary, .container .btn-secondary { background-color: #6C757D; @@ -245,53 +207,28 @@ padding: 20px; display: none; } - @keyframes fade-in { 0% { - transform: translate(-50%, -60%); + transform: translate(-50%, -55%); opacity: 0; } - 100% { - transform: translate(-50%, -55%); + transform: translate(-50%, -50%); opacity: 1; } } - .window-modal table, .window-modal th, .window-modal td { border: 1px #ccc solid; } - -.window-modal table>thead tr th { +.window-modal table > thead tr th { color: #A52A2A; } - -.window-modal table>tbody .selected { +.window-modal table > tbody .selected { background-color: #E7FEFB; } - -.window-modal#optionModal .window-modal-content { - max-height: 80vh; -} - -.window-modal#optionModal .window-modal-content .window-modal-body { - height: 400px; - overflow-y: scroll; -} - -.window-modal#toElevatorModal .window-modal-content { - min-height: 270px; - height: auto; -} - -.window-modal#toElevatorModal .window-modal-content .window-modal-body { - height: auto; -} - .window-modal .window-modal-content { - z-index: 9; background-color: #fff; border-radius: 10px; position: absolute; @@ -299,28 +236,23 @@ padding: 30px; top: 50%; left: 50%; - transform: translate(-50%, -55%); + transform: translate(-50%, -50%); box-shadow: 0 5px 5px #222; animation: fade-in 0.2s linear; } - .window-modal .window-modal-content.modal-xl { max-width: 1200px; } - .window-modal .window-modal-content.modal-lg { max-width: 800px; } - .window-modal .window-modal-content.modal-m { max-width: 450px; } - .window-modal .window-modal-content .window-modal-header { display: flex; flex-direction: column; } - .window-modal .window-modal-content .window-modal-header button.btn-close { position: absolute; top: 10px; @@ -330,74 +262,56 @@ outline: none; border-radius: 50%; } - -.window-modal .window-modal-content .window-modal-header>div>input { +.window-modal .window-modal-content .window-modal-header > div > input { width: 250px; } - -.window-modal .window-back { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: transparent; +.window-modal .window-modal-content .window-modal-body { + overflow-y: scroll; + height: 400px; } -#pricereviewCheck>.container { +#pricereviewCheck > .container { background-color: #F2F2F2; border-radius: 15px; padding: 20px; } - -#pricereviewCheck>.container textarea { +#pricereviewCheck > .container textarea { resize: vertical; } - -#pricereviewCheck>.container table, -#pricereviewCheck>.container th, -#pricereviewCheck>.container td { +#pricereviewCheck > .container table, +#pricereviewCheck > .container th, +#pricereviewCheck > .container td { border: 1px #ccc solid; } - -#pricereviewCheck>.container table.noborder { +#pricereviewCheck > .container table.noborder { border: none !important; } - -#pricereviewCheck>.container table.noborder th, -#pricereviewCheck>.container table.noborder td { +#pricereviewCheck > .container table.noborder th, +#pricereviewCheck > .container table.noborder td { border: none !important; } - -#pricereviewCheck>.container .customerinfo-table input { +#pricereviewCheck > .container .customerinfo-table input { background-color: #EEE5E5; } - -#pricereviewCheck>.container .mi-table th { +#pricereviewCheck > .container .mi-table th { font-weight: 600; } - -#pricereviewCheck>.container .mi-table input[type=text] { +#pricereviewCheck > .container .mi-table input[type=text] { background-color: #EEEEEE; cursor: not-allowed; padding: 6px 12px; font-size: 14px; } - -#pricereviewCheck>.container .mi-table .mi-info { +#pricereviewCheck > .container .mi-table .mi-info { font-size: 14px; } - -#pricereviewCheck>.container .mi-table .mi-info span { +#pricereviewCheck > .container .mi-table .mi-info span { font-size: 15px; font-weight: 600; } - -#pricereviewCheck>.container .mi-table .mi-info .line { +#pricereviewCheck > .container .mi-table .mi-info .line { width: 100%; height: 0.5px; margin: 30px 0; background-color: #ccc; -} - -/*# sourceMappingURL=pricereview.css.map */ \ No newline at end of file +}/*# sourceMappingURL=pricereview.css.map */ \ No newline at end of file diff --git a/wms/mkt/css/pricereview.css.map b/wms/mkt/css/pricereview.css.map index e239ad27..c4374de1 100644 --- a/wms/mkt/css/pricereview.css.map +++ b/wms/mkt/css/pricereview.css.map @@ -1,14 +1 @@ -<<<<<<< HEAD -{"version":3,"sources":["pricereview.scss","pricereview.css"],"names":[],"mappings":"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","file":"pricereview.css"} -======= -{ - "version": 3, - "sources": [ - "pricereview.scss", - "pricereview.css" - ], - "names": [], - "mappings": "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", - "file": "pricereview.css" -} ->>>>>>> 3ca7276d197f3d77f11e3719294215e04a32dc62 +{"version":3,"sources":["pricereview.scss","pricereview.css"],"names":[],"mappings":"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","file":"pricereview.css"} \ No newline at end of file diff --git a/wms/mkt/css/pricereview.scss b/wms/mkt/css/pricereview.scss index 2e9a0c07..ab25188c 100644 --- a/wms/mkt/css/pricereview.scss +++ b/wms/mkt/css/pricereview.scss @@ -12,7 +12,7 @@ >.modal { padding: 20px; - + table, th, td { @@ -145,16 +145,11 @@ tr:hover .copyBtn { opacity: 1; } -<<<<<<< HEAD .copyBtn{ width: 30px; height: 30px; } .saletd{ -======= - - .saletd { ->>>>>>> 3ca7276d197f3d77f11e3719294215e04a32dc62 position: relative; >.deleteBtn { @@ -273,18 +268,13 @@ background-color: #fff; border-radius: 10px; position: absolute; -<<<<<<< HEAD width:90%; -======= - width: 1200px; ->>>>>>> 3ca7276d197f3d77f11e3719294215e04a32dc62 padding: 30px; top: 50%; left: 50%; transform: translate(-50%, -50%); box-shadow: 0 5px 5px #222; animation: fade-in .2s linear; -<<<<<<< HEAD &.modal-xl{ max-width:1200px; } @@ -293,19 +283,6 @@ } &.modal-m{ max-width:450px; -======= - - &.modal-xl { - width: 1200px; - } - - &.modal-lg { - width: 800px; - } - - &.modal-m { - width: 400px; ->>>>>>> 3ca7276d197f3d77f11e3719294215e04a32dc62 } .window-modal-header { diff --git a/wms/mkt/pricereviewCreate.php b/wms/mkt/pricereviewCreate.php index 62e43bfb..9c9acc38 100644 --- a/wms/mkt/pricereviewCreate.php +++ b/wms/mkt/pricereviewCreate.php @@ -294,6 +294,37 @@ if($main){ } $total_spec ++; } + + $paymentRatio = [ + [ + 'scale'=>20, + 'ticket'=>30, + ], + [ + 'scale'=>0, + 'ticket'=>'', + ], + [ + 'scale'=>50, + 'ticket'=>30, + ], + [ + 'scale'=>0, + 'ticket'=>'', + ], + [ + 'scale'=>20, + 'ticket'=>30, + ], + [ + 'scale'=>10, + 'ticket'=>30, + ], + [ + 'scale'=>0, + 'ticket'=>'', + ], + ]; } @@ -1388,11 +1419,11 @@ function convertDateTimeFormat($dateTimeStr) {