From b9941d54897274c292a3b25042e25352e5cab554 Mon Sep 17 00:00:00 2001 From: lilu <534466569@qq.com> Date: Thu, 16 Mar 2023 11:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=B1=E5=8D=95=E7=94=B3=E6=8A=A5=EF=BC=8CVG?= =?UTF-8?q?M=E7=94=B3=E6=8A=A5=EF=BC=8C=E8=B4=A7=E8=BF=90=E9=99=A9?= =?UTF-8?q?=E6=8A=95=E4=BF=9D=EF=BC=8C=E6=8B=BC=E7=AE=B1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8D=95=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyManage/Content/css/orderlist.css | 38 ++--- .../CompanyManage/Content/css/policylist.css | 156 ++++++++++++------ .../Content/img/forward_check.jpg | Bin 1796 -> 1571 bytes .../Views/HuaiTaiInsurance/Index.aspx | 18 +- .../Views/HuaiTaiInsurance/InsuranceOK.aspx | 27 +-- .../HuaiTaiInsurance/InsuranceOKIns.aspx | 33 ++-- .../Views/MsFormRequisition/EditBook.aspx | 11 +- .../Views/MsFormRequisition/StandingBook.aspx | 10 +- .../MvcShipping/Viewsjs/MainForm/MainForm.js | 2 +- PingTai/DSWeb/DSWeb.csproj | 1 + .../Scripts/extjs/resources/css/ext-all.css | 117 ++++++++++++- .../themes/images/default/form/checkbox.gif | Bin 2061 -> 3110 bytes .../images/default/form/date-trigger.gif | Bin 1603 -> 1805 bytes .../images/default/form/spinner-small.gif | Bin 743 -> 1551 bytes .../themes/images/default/form/trigger.gif | Bin 1816 -> 1707 bytes .../themes/images/default/grid/checked.gif | Bin 959 -> 1499 bytes .../images/default/grid/grid3-hd-btn.gif | Bin 1229 -> 2016 bytes .../themes/images/default/grid/page-first.gif | Bin 925 -> 1465 bytes .../themes/images/default/grid/page-last.gif | Bin 923 -> 1467 bytes .../themes/images/default/grid/page-next.gif | Bin 875 -> 1274 bytes .../themes/images/default/grid/page-prev.gif | Bin 879 -> 1274 bytes .../themes/images/default/grid/refresh.gif | Bin 977 -> 1693 bytes .../themes/images/default/menu/checked.gif | Bin 959 -> 1499 bytes .../images/default/menu/menu-parent.gif | Bin 854 -> 1167 bytes .../themes/images/default/shared/left-btn.gif | Bin 870 -> 1132 bytes .../images/default/shared/right-btn.gif | Bin 871 -> 1130 bytes .../images/default/tab/tab-default-close.gif | Bin 896 -> 1461 bytes .../images/default/tools/tool-sprites.gif | Bin 5421 -> 6701 bytes .../themes/images/default/tree/leaf.gif | Bin 945 -> 1397 bytes PingTai/DSWeb/images/masthead.jpg | Bin 28083 -> 5160 bytes 30 files changed, 294 insertions(+), 119 deletions(-) diff --git a/PingTai/DSWeb/Areas/CompanyManage/Content/css/orderlist.css b/PingTai/DSWeb/Areas/CompanyManage/Content/css/orderlist.css index 87f96be..8bd9000 100644 --- a/PingTai/DSWeb/Areas/CompanyManage/Content/css/orderlist.css +++ b/PingTai/DSWeb/Areas/CompanyManage/Content/css/orderlist.css @@ -343,8 +343,8 @@ select { border:1px solid #e4e5e6; } .user-information ul li .btn.copy:hover { - background: #30a1c7; - border: 1px solid #30a1c7; + background: #35b691; + border: 1px solid #35b691; color: #FFF; } .user-jurisdiction { @@ -460,26 +460,26 @@ select { display: block; width: 5px; height: 20px; - background: #42b0d5; + background: #4dbf9f; margin-right: 10px; float: left; } /*按钮*/ .btn { padding: 7px 25px; - font-size: 15px; + font-size: 14px; } .btn-primary { - background: #42b0d5; - border: 1px solid #42b0d5; + background: #4dbf9f; + border: 1px solid #4dbf9f; border-radius: 25px; } .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active { - background: #30a1c7 !important; - border: 1px solid #30a1c7 !important; + background: #35b691 !important; + border: 1px solid #35b691 !important; color: #FFF; } .btn-default { @@ -488,7 +488,7 @@ select { border-radius: 25px !important; } .btn-default:hover { - border: 1px solid #30a1c7 !important; + border: 1px solid #35b691 !important; background: none !important; color: #6b6b6b; } @@ -570,8 +570,8 @@ body .layer-ext-moon .layui-layer-btn { background: #FFF !important; } body .layer-ext-moon .layui-layer-btn .layui-layer-btn0 { - background: #42b0d5 !important; - border: 1px solid #42b0d5; + background: #4dbf9f !important; + border: 1px solid #4dbf9f; border-radius: 25px !important; /*margin-right:25px;*/ } @@ -607,7 +607,7 @@ body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 { color: #777; } .form-control:focus { - border: 1px solid #42b0d5 !important; + border: 1px solid #4dbf9f !important; } .form-control, .single-line { border: 1px solid #dfdfdf !important; @@ -633,7 +633,7 @@ input:-ms-input-placeholder { } /*日期选择*/ .datepicker table tr td.active { - background: #42b0d5 !important; + background: #4dbf9f !important; } /*提醒设置*/ @@ -666,9 +666,9 @@ input:-ms-input-placeholder { } .subscribe input[type='checkbox']:checked, .remind input[type='checkbox']:checked { - background: #42b0d5 url(../img/check.png) no-repeat center; + background: #4dbf9f url(../img/check.png) no-repeat center; background-size: cover; - border: 1px solid #42b0d5; + border: 1px solid #4dbf9f; } .subscribe .low-price { background: #f4fafd; @@ -768,7 +768,7 @@ input:-ms-input-placeholder { padding-left:15px; } .ul-group li:hover { - background: #42b0d5; + background: #4dbf9f; color: #FFF; } /*用户权限*/ @@ -836,7 +836,7 @@ input:-ms-input-placeholder { .select:focus { outline: none; - border: 1px solid #42b0d5 !important; + border: 1px solid #4dbf9f !important; } .select option { @@ -847,8 +847,8 @@ input:-ms-input-placeholder { } .btn-query { margin-right: 10px; - background: #42b0d5; - border: 1px solid #42b0d5; + background: #4dbf9f; + border: 1px solid #4dbf9f; color: #FFF; border-radius: 25px; } diff --git a/PingTai/DSWeb/Areas/CompanyManage/Content/css/policylist.css b/PingTai/DSWeb/Areas/CompanyManage/Content/css/policylist.css index 0de9fc5..d9b2810 100644 --- a/PingTai/DSWeb/Areas/CompanyManage/Content/css/policylist.css +++ b/PingTai/DSWeb/Areas/CompanyManage/Content/css/policylist.css @@ -1,11 +1,15 @@ /*公共样式*/ input:focus { - border: 1px solid #42b0d5 !important; + border: 1px solid #4dbf9f !important; outline:none; } .form-horizontal .control-label{ font-size:14px; } +.top-navigation .wrapper.wrapper-content { + padding-top: 15px !important; + padding-left: 5px !important; +} /*复选框样式*/ input[type='checkbox'] { width: 14px; @@ -19,22 +23,20 @@ input[type='checkbox'] { margin-top: 1px; margin-right: 7px; } -input[type='checkbox']:checked { - background: url(../img/read_check.jpg) no-repeat center; -} + input[type='checkbox']:checked { + background: url(../img/forward_check.jpg) no-repeat center; + border: 1px solid #41b1d7; + } /*表单*/ -.form-policylist { - -} .form-policylist .form-group .control-label { width: 24%; - color: #666; + color: #333; margin-right: 15px; font-weight: normal; } .form-policylist .form-group { width: 19%; - height: 34px; + height: 32px; margin-left: 15px; margin-right: 15px; margin-bottom: 8px; @@ -44,8 +46,10 @@ input[type='checkbox']:checked { .form-policylist input { width: 225px; - height: 34px; + height: 32px; + line-height:32px; border: 1px solid #e2e2e2; + border-radius:3px; padding-left: 10px; vertical-align: middle; } @@ -61,6 +65,9 @@ input[type='checkbox']:checked { } @media screen and (max-width: 1680px) { + .btn-summary .btn-query, .btn-summary .btn-reset{ + margin-top:36px; + } .form-policylist .form-group { height: 66px !important; } @@ -87,20 +94,21 @@ input[type='checkbox']:checked { margin-left:15px; } .btn-query, .btn-reset { - padding: 7px 25px; + padding: 7px 15px; margin-top: 5px; - border-radius: 0 !important; + border-radius: 3px !important; } .btn-query span.glyphicon, .btn-reset span.glyphicon { - margin-right: 5px; + margin-right: 7px; + font-size:12px; } .btn-query { - background: #42b0d5; - border: 1px solid #42b0d5; + background: #4dbf9f; + border: 1px solid #4dbf9f; color: #FFF; - margin-right: 15px; + margin-right: 10px; } .btn-query:hover { @@ -112,11 +120,19 @@ input[type='checkbox']:checked { border: 1px solid #e2e2e2; color: #666; } -/*表格*/ -.policylist-table { - /*border:1px solid #ebebeb;*/ - border-bottom:none !important; +.btn-summary{ + margin-top:-5px; + margin-left:15px; } + .btn-summary .btn-query, .btn-summary .btn-reset{ + padding:6px 15px !important; + font-size:12px; + } + /*表格*/ + .policylist-table { + /*border:1px solid #ebebeb;*/ + border-bottom: none !important; + } .policylist-table thead tr th { background: #fafafa; height:40px; @@ -130,22 +146,24 @@ input[type='checkbox']:checked { } /*用户信息*/ .form-group .control-label span{ + width:7px; margin-top:2px; margin-right:1px; display:inline-block; float:left; } .user-info, .cargo-info, .tran-info { - border: 2px solid #ebebeb; + border: 2px solid #9adbc8; position: relative; padding: 15px; + border-radius: 3px; } .user-info .title, .cargo-info .title,.tran-info .title { width: 95px; height: 20px; line-height: 20px; text-align: center; - color: #d4af02; + color: #000; font-size: 16px; position: absolute; top: -12px; @@ -157,15 +175,19 @@ input[type='checkbox']:checked { float:left; margin-right:20px; } -.form-confirm .form-group .control-label{ - width:auto !important; - margin-right:5px; - color:#333; -} + .form-confirm .form-group.form-none{ + margin-right:0px; + } + .form-confirm .form-group .control-label { + width: auto !important; + margin-right: 5px; + color: #333; + } .form-confirm .form-group input[type='text'] { height: 30px; color: #999; border: 1px solid #e2e2e2; + border-radius:3px; padding-left: 10px; vertical-align: middle; } @@ -208,32 +230,32 @@ input[type='checkbox']:checked { } .form-confirm .cargo-info .form-textarea, .form-confirm .tran-info .form-textarea { width: 31%; - border: 1px solid #e2e2e2; + border: 1px solid #e2e2e2 !important; } .form-confirm .cargo-info .form-textarea .value, .form-confirm .tran-info .form-textarea .value { padding-left:10px; padding-bottom:5px; } -.form-confirm .cargo-info .form-textarea .control-label, .form-confirm .tran-info .form-textarea .control-label { - width: 100% !important; - height: 33px; - background: #f6f6f6; - display: inline-block; - text-align: left; - padding-left: 15px; -} + .form-confirm .cargo-info .form-textarea .control-label, .form-confirm .tran-info .form-textarea .control-label { + width: 100% !important; + height: 33px; + /*background: #f6f6f6;*/ + border-bottom: 1px solid #e2e2e2; + display: inline-block; + text-align: left; + padding-left: 15px; + } .form-confirm .cargo-info .form-group .value { width: 130px; } .form-confirm .cargo-info .form-textarea textarea, .form-confirm .tran-info .form-textarea textarea { width: 100%; - height: 80px; - border: none; + border: none !important; } /*运输信息*/ .form-confirm .tran-info { margin-top: 20px; - height: 325px; + height: 335px; } .form-confirm .tran-info .form-group{ width:23%; @@ -242,9 +264,12 @@ input[type='checkbox']:checked { .form-confirm .tran-info .form-group.form-risk { width: 10%; } -.form-confirm .tran-info .form-group input[type='text'], .form-confirm .tran-info .form-group .select { - width: 145px; -} + .form-confirm .tran-info .form-group.form-risk input[type='checkbox']{ + margin-top:3px !important; + } + .form-confirm .tran-info .form-group input[type='text'], .form-confirm .tran-info .form-group .select { + width: 145px; + } .form-confirm .tran-info .form-group .value{ width:140px; } @@ -256,7 +281,7 @@ input[type='checkbox']:checked { float:left; } .form-confirm .tran-info .form-group .input-group .input-group-btn .btn{ - padding:3px 10px; + padding:4px 10px; } .form-group input[type="radio"] + .radio-label::before { content: ''; @@ -264,14 +289,14 @@ input[type='checkbox']:checked { width: 13px; height: 13px; border-radius: 50%; - border: 1px solid #42b0d5; + border: 1px solid #4dbf9f; margin-right: 10px; margin-top: -1px; } .form-group input[type="radio"]:checked + .radio-label::before { background-clip: content-box; - background-color: #42b0d5; + background-color: #4dbf9f; width: 13px; height: 13px; padding: 2px; @@ -293,21 +318,22 @@ input[type='checkbox']:checked { padding-left:10px; } .form-confirm .form-cost { - background: #ecf7fb; - padding:10px 15px 5px 15px; - margin-top:15px; - margin-bottom:10px; + background: #e1f4ef; + padding: 10px 15px 5px 15px; + margin-top: 15px; + margin-bottom: 10px; } .form-confirm .form-cost p{ font-size:15px; color:#333; + margin-bottom:5px !important; } .form-confirm .form-cost p b { color: #cc000e; font-size:20px; } .form-confirm .form-cost p.deductible{ - color:#999; + color:#333; } /*我已阅读*/ .form-confirm .form-read{ @@ -343,4 +369,34 @@ input[type='checkbox']:checked { /*保单详情补充*/ .form-confirm .cargo-info .form-textarea, .form-confirm .tran-info .form-textarea { border: none; +} +.bootstrap-table .table > thead > tr > th:first-child{ + padding-top:10px !important; + padding-left:16px !important; +} +.btn-deter { + background: #7bd0b8 !important; + border-color: #7bd0b8 !important; +} +/*用户信息*/ +.user-info .form-group{ + width:30% !important; + margin-bottom:10px; +} +/*货物信息*/ +.cargo-info .form-group { + width: 19% !important; + margin-bottom: 10px; +} +/*运输信息*/ +.cargo-info .form-group { + width: 23% !important; + margin-bottom: 10px; +} +.form-policylist .btn{ + font-size:13px; + font-weight:normal; +} +.fixed-table-container{ + border:none !important; } \ No newline at end of file diff --git a/PingTai/DSWeb/Areas/CompanyManage/Content/img/forward_check.jpg b/PingTai/DSWeb/Areas/CompanyManage/Content/img/forward_check.jpg index c02a7bb1b403fefd4f0538e329a11234b4c16bd0..08613b0b19f4560dd10d1a0feddea73461d2158f 100644 GIT binary patch delta 773 zcmZqSTg)T=|Hl7^3=*ytnQ06Ro}O9^91LJEalSO8=43l2nTgj+Rn2sh4NXiH%q{f{ z&5TVfEp-%(3=A#w4J`BxjdcyptV|57jEp81GL}rXVoI5O52$ewvqX%!qmhM?v$LbK zv4N4Hp{t9fv4NALv6-8jft!<~o4J#cLPc(YudkJ7UU5lcUUI6Zi>(q+L@zTl#R{s| z5|`e|vzYWJ-)1(O+{!FHS%*b&@)$>}V2>-iY?m>C5bm;@P_1sVSzVW?+dWMqVR z2}-hYa56G5F{22wa4@p6aS1RmvM@0+GjhVzGc&QUvN5uA2#bk}FbE|zr%ZKI=L8zg z$i&Rb3ReZ>v9JmX2{R~(u+_6GIwm%X85SlrO>z-cJ?&!odXtc%RgWfLW#eAbE_Y1FYh`_cXqSh` zWRaQq-21srHdR_K-4W}t*W%c{upQfu=goe6b6e}e$#s+3Gj;}RUQp0hk)3TeO>9l# zytOP!=ggI)n9L6sHuY_`o9uJASnlBcHVfGq+~1vl%9I8jzsN0maBoWPRL-Kq}TGLMJOMmr_UA^XM&okBC(Nkwl zjaYlNTzf@u()!$G^M2a0-3mJ^*w^(W!tm9vZF>cGoR~iCs82`-r&K%JhvPS&ZoU5L z?c-l;=hJuD`@H2Wf0{YtnAoza48^7=7iGD+lEZbpRX)C(xv1N0Nu`)i%aO|Hl7^3=3QCQinHXe%EF%yGvZa8u9}s7@voJ6M z=?owSfysqT(n$x>889t? z=;j6TnUUBalR#n&4FBIS2)dLeXIBDk0qIHs3O!_gKRJ<6W}<(os)25@fti7VnW3Jc zv5C34xsHO7fuVuEfswwUk*=Y+m9Y`f(upriCZAwb(#Xjxwn|C1RmvzSDX`MlFDNa_ z(aSGN*H1~-Pt8fqP0cGQ)(0A-KRJjoe{vF&cD+JHZh@6^QEFmIstXX?Dgh0*)HO8J zHM9&dG_x|Xv@$h@_)7__)HgpRGp!P)6h{z1m8O;?rX-dm;!~^)bi0y5O0rd2eo<~> ziLFv*Zen_>epW$hI@l0jUn|eaE168$fzAZ7T_!(eGMU`VWX5PRiCJ>;T_z<)(@D(V z>UkM>nHdEcm;@P_1sVSzVJKl>WCTSS0H2zPLFdMeer_!T%Zf3g$!EHQcWuWxVn#YW$b zxMY-<-K%uPfHRY^zAM1iHAKMEX{uq_ijD`%doJnENZkF*cE-7%g{6}Z`)lb*zG#~$ z7jnyAQ=IpsOdDtJSJS;atZ(1vUXj&rcI(!Rg~7pI^G{lco2-|a+$O#3Yux2UbPx$+qY5nao}0s ziEHG`UhkPYUFW*W`_HSg!fzi6nW@jb_O$7a^mX6k_)A~!>f`p4x}wVa?_Su{m21vg PpE^;cVzIE}#Q&QBsFM>5 diff --git a/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/Index.aspx b/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/Index.aspx index 0123d74..7f49edf 100644 --- a/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/Index.aspx +++ b/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/Index.aspx @@ -19,18 +19,21 @@
-
+ -
+
- 新增 - 删除 + 新增 + 删除 发送 - +
- + + + 下载未出险证明模板 +
@@ -64,8 +67,7 @@
-
-
+
查询 重置
diff --git a/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOK.aspx b/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOK.aspx index 4a089c0..24b3c24 100644 --- a/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOK.aspx +++ b/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOK.aspx @@ -69,7 +69,7 @@
- + " name="InvoiceNumber" id="InvoiceNumber">
@@ -77,19 +77,19 @@ " readonly />
- + 点击选择
-
+
-
+
-
+
@@ -128,7 +128,7 @@
-
+
战争险
@@ -142,6 +142,7 @@
+
@@ -166,7 +167,7 @@
- +
@@ -181,7 +182,7 @@
-
+
" autocomplete="off" required /> @@ -195,7 +196,7 @@
" id="state" />
-
+

- +
-
+
" />
-
+
@@ -289,7 +290,7 @@
特别提示：特殊货物不属于自动承保的范围，需由保险公司人工审核确定是否承保、以及相应的承保费率和免赔；投保人选择的货物类型与实际运输不符，保单合同不成立，保险人不负任何赔偿责任。
- + diff --git a/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOKIns.aspx b/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOKIns.aspx index 378d43a..b8fcf85 100644 --- a/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOKIns.aspx +++ b/PingTai/DSWeb/Areas/MvcShipping/Views/HuaiTaiInsurance/InsuranceOKIns.aspx @@ -66,11 +66,11 @@
- + " name="ApplicantName" id="ApplicantName" readonly>
- + " name="SerialNumber" id="SerialNumber" readonly>
@@ -85,7 +85,7 @@
- +
- +
@@ -126,15 +126,15 @@ 点击选择
-
+
-
+
-
+
@@ -173,7 +173,7 @@
-
+
战争险
@@ -187,6 +187,7 @@
+
@@ -211,7 +212,7 @@
- +
@@ -226,8 +227,7 @@
-
-
+
@@ -239,7 +239,8 @@
-
+
+

- +
-
+
-
+
@@ -320,7 +321,7 @@
特别提示：特殊货物不属于自动承保的范围，需由保险公司人工审核确定是否承保、以及相应的承保费率和免赔；投保人选择的货物类型与实际运输不符，保单合同不成立，保险人不负任何赔偿责任。
货物类型 货物类型描述
- + diff --git a/PingTai/DSWeb/Areas/MvcShipping/Views/MsFormRequisition/EditBook.aspx b/PingTai/DSWeb/Areas/MvcShipping/Views/MsFormRequisition/EditBook.aspx index 964bceb..8d88151 100644 --- a/PingTai/DSWeb/Areas/MvcShipping/Views/MsFormRequisition/EditBook.aspx +++ b/PingTai/DSWeb/Areas/MvcShipping/Views/MsFormRequisition/EditBook.aspx @@ -9,7 +9,7 @@ 编辑页面 - +
货物类型 货物类型描述