M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'cheng' of http://10.10.1.6:3080/masada-admin/httpdocs into cheng

gary
Cheng 1 year ago
parent
290bcfcc9d 98868b44ee
commit
a02f3824dc
2 changed files with 833 additions and 882 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      wms/mkt/assets/js/pricereviewAlpine.js
  2. 118
      wms/mkt/css/pricereview.css

17
wms/mkt/assets/js/pricereviewAlpine.js
View File

@ -1,11 +1,20 @@
const pricereviewCreate = () => { const pricereviewCreate = () => {
const pricereviewCreate = () => {
return { return {
init() {
init() { init() {
this.elevators = elevators; this.elevators = elevators;
console.log(this.elevators); console.log(this.elevators);
console.log(this.total_spec); console.log(this.total_spec);
}, },
openFn: {
4: '2U',
5: "4PCO",
7: "6PCO",
8: "2S",
9: "CO"
openFn: { openFn: {
4: '2U', 4: '2U',
5: "4PCO", 5: "4PCO",
@ -25,7 +34,7 @@ const pricereviewCreate = () => {
kind: 1, kind: 1,
subkind: 1, subkind: 1,
buttons: [], buttons: [],
modalSelectedOptions: {}, modalSelectedOptions: { },
selectedOptions: [], selectedOptions: [],
elevators: [], elevators: [],
toElevators: [], toElevators: [],
@ -603,7 +612,7 @@ const pricereviewCreate = () => {
}, },
} }
} }
const pricereviewCheck = () => { const pricereviewCheck = () => {
@ -797,7 +806,7 @@ const pricereviewCheck = () => {
console.log(sign); console.log(sign);
}, },
} }
} }
const pricereviewMaintainCreate = () => { const pricereviewMaintainCreate = () => {
@ -812,4 +821,4 @@ const pricereviewMaintainCreate = () => {
}, },
} }
} }

118
wms/mkt/css/pricereview.css
View File

@ -14,29 +14,21 @@
#pricereviewCreate>.modal table, #pricereviewCreate>.modal table,
#pricereviewCreate>.modal th, #pricereviewCreate>.modal th,
#pricereviewCreate>.modal td, #pricereviewCreate>.modal td {
#pricereviewMaintainCreate>.modal table,
#pricereviewMaintainCreate>.modal th,
#pricereviewMaintainCreate>.modal td {
border: 1px #ccc solid; border: 1px #ccc solid;
} }
#pricereviewCreate>.modal table>thead tr th, #pricereviewCreate>.modal table>thead tr th {
#pricereviewMaintainCreate>.modal table>thead tr th {
color: #A52A2A; color: #A52A2A;
} }
#pricereviewCreate>.modal table>tbody .selected, #pricereviewCreate>.modal table>tbody .selected {
#pricereviewMaintainCreate>.modal table>tbody .selected {
background-color: #E7FEFB; background-color: #E7FEFB;
} }
#pricereviewCreate .container table, #pricereviewCreate .container table,
#pricereviewCreate .container th, #pricereviewCreate .container th,
#pricereviewCreate .container td, #pricereviewCreate .container td {
#pricereviewMaintainCreate .container table,
#pricereviewMaintainCreate .container th,
#pricereviewMaintainCreate .container td {
border: 1px #ccc solid; border: 1px #ccc solid;
padding: 15px; padding: 15px;
} }
@ -49,31 +41,19 @@
#pricereviewCreate .container th .noborder td, #pricereviewCreate .container th .noborder td,
#pricereviewCreate .container td.noborder, #pricereviewCreate .container td.noborder,
#pricereviewCreate .container td .noborder th, #pricereviewCreate .container td .noborder th,
#pricereviewCreate .container td .noborder td, #pricereviewCreate .container td .noborder td {
#pricereviewMaintainCreate .container table.noborder,
#pricereviewMaintainCreate .container table .noborder th,
#pricereviewMaintainCreate .container table .noborder td,
#pricereviewMaintainCreate .container th.noborder,
#pricereviewMaintainCreate .container th .noborder th,
#pricereviewMaintainCreate .container th .noborder td,
#pricereviewMaintainCreate .container td.noborder,
#pricereviewMaintainCreate .container td .noborder th,
#pricereviewMaintainCreate .container td .noborder td {
border: none; border: none;
} }
#pricereviewCreate .container table thead th, #pricereviewCreate .container table thead th {
#pricereviewMaintainCreate .container table thead th {
background-color: #6D9EEB; background-color: #6D9EEB;
} }
#pricereviewCreate .container table tbody td input, #pricereviewCreate .container table tbody td input {
#pricereviewMaintainCreate .container table tbody td input {
font-size: 14px; font-size: 14px;
} }
#pricereviewCreate .container table tbody th, #pricereviewCreate .container table tbody th {
#pricereviewMaintainCreate .container table tbody th {
background-color: #CCE4F8; background-color: #CCE4F8;
font-size: 14px; font-size: 14px;
padding: 15px 2px; padding: 15px 2px;
@ -81,21 +61,18 @@
text-align: center; text-align: center;
} }
#pricereviewCreate .container table input, #pricereviewCreate .container table input {
#pricereviewMaintainCreate .container table input {
font-size: 13px; font-size: 13px;
} }
#pricereviewCreate .container .pricreviewmain, #pricereviewCreate .container .pricreviewmain {
#pricereviewMaintainCreate .container .pricreviewmain {
background-color: #F2F2F2; background-color: #F2F2F2;
padding: 20px; padding: 20px;
border-radius: 6px; border-radius: 6px;
margin: 30px 0; margin: 30px 0;
} }
#pricereviewCreate .container .pricreviewmain button, #pricereviewCreate .container .pricreviewmain button {
#pricereviewMaintainCreate .container .pricreviewmain button {
color: #fff; color: #fff;
width: 55px; width: 55px;
height: 30px; height: 30px;
@ -104,35 +81,30 @@
font-size: 13px; font-size: 13px;
} }
#pricereviewCreate .container .pricreviewmain button.addbtn, #pricereviewCreate .container .pricreviewmain button.addbtn {
#pricereviewMaintainCreate .container .pricreviewmain button.addbtn {
background-color: #337AB7; background-color: #337AB7;
width: 30px; width: 30px;
} }
#pricereviewCreate .container .pricreviewmain button.deleteBtn, #pricereviewCreate .container .pricreviewmain button.deleteBtn {
#pricereviewMaintainCreate .container .pricreviewmain button.deleteBtn {
background-color: #D9534F; background-color: #D9534F;
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
width: 30px; width: 30px;
} }
#pricereviewCreate .container .pricreviewmain button.selectElevator, #pricereviewCreate .container .pricreviewmain button.selectElevator {
#pricereviewMaintainCreate .container .pricreviewmain button.selectElevator {
background-color: #D9534F; background-color: #D9534F;
color: #fff; color: #fff;
} }
#pricereviewCreate .container .pricreviewmain>.divitem, #pricereviewCreate .container .pricreviewmain>.divitem {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem {
border: 1px #ccc solid; border: 1px #ccc solid;
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
} }
#pricereviewCreate .container .pricreviewmain>.divitem .title, #pricereviewCreate .container .pricreviewmain>.divitem .title {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem .title {
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 1px #ccc solid; border-bottom: 1px #ccc solid;
@ -140,17 +112,13 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
#pricereviewCreate .container .pricreviewmain>.divitem .title h6, #pricereviewCreate .container .pricreviewmain>.divitem .title h6 {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem .title h6 {
font-weight: 600; font-weight: 600;
} }
#pricereviewCreate .container .pricreviewmain>.divitem table, #pricereviewCreate .container .pricreviewmain>.divitem table,
#pricereviewCreate .container .pricreviewmain>.divitem th, #pricereviewCreate .container .pricreviewmain>.divitem th,
#pricereviewCreate .container .pricreviewmain>.divitem td, #pricereviewCreate .container .pricreviewmain>.divitem td {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem th,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem td {
font-size: 14px; font-size: 14px;
background-color: transparent; background-color: transparent;
} }
@ -163,16 +131,7 @@
#pricereviewCreate .container .pricreviewmain>.divitem th textarea, #pricereviewCreate .container .pricreviewmain>.divitem th textarea,
#pricereviewCreate .container .pricreviewmain>.divitem td input, #pricereviewCreate .container .pricreviewmain>.divitem td input,
#pricereviewCreate .container .pricreviewmain>.divitem td select, #pricereviewCreate .container .pricreviewmain>.divitem td select,
#pricereviewCreate .container .pricreviewmain>.divitem td textarea, #pricereviewCreate .container .pricreviewmain>.divitem td textarea {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table input,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table select,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table textarea,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem th input,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem th select,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem th textarea,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem td input,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem td select,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem td textarea {
font-size: 13px; font-size: 13px;
} }
@ -181,31 +140,21 @@
#pricereviewCreate .container .pricreviewmain>.divitem th input[type=number]::-webkit-outer-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 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-outer-spin-button,
#pricereviewCreate .container .pricreviewmain>.divitem td input[type=number]::-webkit-inner-spin-button, #pricereviewCreate .container .pricreviewmain>.divitem td input[type=number]::-webkit-inner-spin-button {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table input[type=number]::-webkit-outer-spin-button,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table input[type=number]::-webkit-inner-spin-button,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem th input[type=number]::-webkit-outer-spin-button,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem th input[type=number]::-webkit-inner-spin-button,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem td input[type=number]::-webkit-outer-spin-button,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem td input[type=number]::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;
margin: 0; margin: 0;
} }
#pricereviewCreate .container .pricreviewmain>.divitem table tr:hover .deleteBtn, #pricereviewCreate .container .pricreviewmain>.divitem table tr:hover .deleteBtn,
#pricereviewCreate .container .pricreviewmain>.divitem table tr:hover .copyBtn, #pricereviewCreate .container .pricreviewmain>.divitem table tr:hover .copyBtn {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table tr:hover .deleteBtn,
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table tr:hover .copyBtn {
opacity: 1; opacity: 1;
} }
#pricereviewCreate .container .pricreviewmain>.divitem table .saletd, #pricereviewCreate .container .pricreviewmain>.divitem table .saletd {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table .saletd {
position: relative; position: relative;
} }
#pricereviewCreate .container .pricreviewmain>.divitem table .saletd>.deleteBtn, #pricereviewCreate .container .pricreviewmain>.divitem table .saletd>.deleteBtn {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table .saletd>.deleteBtn {
position: absolute; position: absolute;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
@ -214,8 +163,7 @@
transition: 0.3s; transition: 0.3s;
} }
#pricereviewCreate .container .pricreviewmain>.divitem table .saletd>.copyBtn, #pricereviewCreate .container .pricreviewmain>.divitem table .saletd>.copyBtn {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table .saletd>.copyBtn {
position: absolute; position: absolute;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
@ -226,40 +174,34 @@
height: 30px; height: 30px;
} }
#pricereviewCreate .container .pricreviewmain>.divitem table textarea, #pricereviewCreate .container .pricreviewmain>.divitem table textarea {
#pricereviewMaintainCreate .container .pricreviewmain>.divitem table textarea {
height: auto; height: auto;
min-height: 50px; min-height: 50px;
} }
#pricereviewCreate .container .pricreviewmain>.filediv, #pricereviewCreate .container .pricreviewmain>.filediv {
#pricereviewMaintainCreate .container .pricreviewmain>.filediv {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 20px; margin-top: 20px;
} }
#pricereviewCreate .container .pricreviewmain>.filediv label, #pricereviewCreate .container .pricreviewmain>.filediv label {
#pricereviewMaintainCreate .container .pricreviewmain>.filediv label {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 10px 0; margin: 10px 0;
} }
#pricereviewCreate .container .pricreviewmain>.filediv label p, #pricereviewCreate .container .pricreviewmain>.filediv label p {
#pricereviewMaintainCreate .container .pricreviewmain>.filediv label p {
width: 100px; width: 100px;
font-size: 15px; font-size: 15px;
font-weight: 600; font-weight: 600;
} }
#pricereviewCreate .container .pricreviewmain>.filediv label input[type=file], #pricereviewCreate .container .pricreviewmain>.filediv label input[type=file] {
#pricereviewMaintainCreate .container .pricreviewmain>.filediv label input[type=file] {
width: 400px; width: 400px;
} }
#pricereviewCreate .container .pricreviewmain>.filediv label button, #pricereviewCreate .container .pricreviewmain>.filediv label button {
#pricereviewMaintainCreate .container .pricreviewmain>.filediv label button {
width: 90px; width: 90px;
height: 35px; height: 35px;
margin: 0; margin: 0;

Write Preview
Loading…
Cancel
Save