x

src/ajax/index.js

@@ -15,7 +15,7 @@ export let NODE_ENVS = "/";
 switch (envs) {
   case 'development':
     //开发环境
-    NODE_ENVS = 'http://192.168.2.251:8080';
+    NODE_ENVS = 'http://192.168.1.251:8080';
     break;
   case 'test':
     //测试环境

src/assets/css/public/common.less

@@ -338,8 +338,8 @@ body {
       background-color: #F1F4FA
     }
   }
-  .el-table__body tr.hover-row.current-row>td, .el-table__body tr.hover-row.el-table__row--striped.current-row>td, .el-table__body tr.hover-row.el-table__row--striped>td, .el-table__body tr.hover-row>td{
-    background: #F1F8FF;
+  .el-table--enable-row-hover .el-table__body tr:hover>td,.el-table__body tr.hover-row.current-row>td, .el-table__body tr.hover-row.el-table__row--striped.current-row>td, .el-table__body tr.hover-row.el-table__row--striped>td, .el-table__body tr.hover-row>td{
+    background: #F1F8FF!important;
   }
 
   .el-table__body-wrapper::-webkit-scrollbar {

src/assets/css/public/common.min.css

-html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:rgba(0,0,0,0) !important}html,body{font-family:PingFangSC-Regular,PingFang SC,'Microsoft Yahei',sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px;color:#646B78}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden;background:#F1F4FA}.f-blue{color:#1969F9}.f-green{color:#3FBE1B}.f-yellow1{color:#CC8200}.f-red1{color:#FC1F00}.el-pagination{text-align:right;margin-top:20px}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important;top:100px !important}.el-message--info .el-icon-info{display:none}.el-message--info .el-message__content{color:#fff !important}.pagex{padding:20px}.pagex .el-input__inner{height:38px;border-radius:2px;border:1px solid #BEC9DF;font-size:14px}.pagex .el-input__inner:focus{border:1px solid #387FFF}.pagex .el-form-item__label{color:#666}.pagex .el-range-editor.el-input__inner{width:257px}.pagex .el-select .el-input.is-focus .el-input__inner,.pagex .el-range-editor.is-active,.pagex .el-range-editor.is-active:hover{border-color:#387FFF}.pagex .el-select{width:100px}.pagex .el-form--inline .el-form-item{margin-right:30px}.pagex .el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.pagex .el-message--info .el-icon-info{display:none}.pagex .el-message--info .el-message__content{color:#fff !important}.pagex .el-input__inner{color:#333 !important}.pagex input::-webkit-input-placeholder{color:#A1ACC1 !important}.pagex .el-table,.pagex .el-table thead{color:#333}.pagex .el-checkbox__input.is-checked .el-checkbox__inner,.pagex .el-checkbox__input.is-indeterminate .el-checkbox__inner{background-color:#1969F9;border-color:#1969F9}.pagex .el-select .el-input__inner:focus{border-color:#C0C4CC}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header th{background-color:#F1F4FA}.pagex .el-table__body tr.hover-row.current-row>td,.pagex .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.pagex .el-table__body tr.hover-row.el-table__row--striped>td,.pagex .el-table__body tr.hover-row>td{background:#F1F8FF}.pagex .el-table__body-wrapper::-webkit-scrollbar{width:18px}.pagex .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:8px;background:#fff;width:18px;-webkit-box-shadow:inset 0 0 8px rgba(0,0,0,0.2)}.pagex .el-table__body-wrapper::-webkit-scrollbar-track{border-radius:0;background:#D2D9E7}.pagex .el-table td,.pagex .el-table th.is-leaf,.pagex .el-table--border,.pagex .el-table--group{border-color:#D2D9E7}.pagex .el-table--border::after,.pagex .el-table--group::after,.pagex .el-table::before{background-color:#D2D9E7}.pagex .el-table__fixed-body-wrapper{z-index:4}.zdypop .el-form-item__label{color:#333}.zdypop .el-input.is-disabled{background-color:#F1F4FA;border-color:#F1F4FA}.zdypop .el-input.is-disabled .el-input__inner{background-color:#F1F4FA;border-color:#F1F4FA}.el-cascader-panel{min-height:150px;max-height:300px}.placehoload .el-input__inner::-webkit-input-placeholder{color:#333}.el-tooltip__popper{box-shadow:1px 2px 10px 0 rgba(119,135,145,0.5);border:1px solid #387FFF !important;border-radius:0px !important}.el-tooltip__popper .boxxrth2021{width:150px;background:#fff;font-size:12px;color:#333}.el-tooltip__popper .boxxrth2021 p{height:28px;line-height:28px}.el-tooltip__popper .boxxrth2021 p span{width:50%}.el-tooltip__popper[x-placement="top"] .popper__arrow{border-top-color:#387FFF !important}.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#387FFF !important}.el-tooltip__popper.is-light[x-placement^=top] .popper__arrow{border-top-color:#387FFF !important}.el-tooltip__popper.is-light[x-placement^=bottom] .popper__arrow{border-bottom-color:#387FFF !important}.el-tooltip__popper.is-light[x-placement^=left] .popper__arrow{border-left-color:#387FFF !important}.el-dialog__body{padding:20px !important}.el-dialog__title{font-size:14px;color:#333;font-weight:bold;position:relative}.el-dialog__title::after{content:"";position:absolute;width:5px;height:22px;background:#1969F9;left:-20px;top:2px}.el-icon-close{font-size:24px}.el-icon-close:hover,.el-icon-close:focus{color:#1969F9 !important}.el-message-box__container{text-align:center;padding:15px 0px}.el-message-box__message{display:inline-block}.el-message-box__message p{color:#333;font-size:16px}.el-message-box__status.el-icon-error{color:#FC1F00 !important;font-size:25px !important}.el-message-box__close:before{content:"\E609"}.el-message-box__btns .el-button,.dialog-footer .el-button{width:76px;height:34px;text-align:center;line-height:34px;background:#E8ECF4;border:1px solid #E8ECF4;border-radius:2px;color:#8391AD;font-size:14px;padding:0px}.el-message-box__btns .el-button:hover,.dialog-footer .el-button:hover,.el-message-box__btns .el-button:focus,.dialog-footer .el-button:focus{color:#8391AD;background:#E8ECF4;border:1px solid #E8ECF4}.el-message-box__btns .el-button.el-button--primary,.dialog-footer .el-button.el-button--primary{border:1px solid #1969F9;color:#fff;background:#1969F9}.el-message-box__btns .el-button.el-button--primary:hover,.dialog-footer .el-button.el-button--primary:hover,.el-message-box__btns .el-button.el-button--primary:focus,.dialog-footer .el-button.el-button--primary:focus{color:#fff;background:#1969F9;border:1px solid #1969F9}.p-text{margin-bottom:6px}.p-text em{width:56px;text-align:left}.p-text span{width:214px;height:30px;background:#F1F4FA;border-radius:2px;font-size:14px;color:#333333;padding-left:7px;margin-left:8px;text-align:left}.popper-class-box .popper__arrow{left:20px !important}
\ No newline at end of file
+html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:rgba(0,0,0,0) !important}html,body{font-family:PingFangSC-Regular,PingFang SC,'Microsoft Yahei',sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px;color:#646B78}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden;background:#F1F4FA}.f-blue{color:#1969F9}.f-green{color:#3FBE1B}.f-yellow1{color:#CC8200}.f-red1{color:#FC1F00}.el-pagination{text-align:right;margin-top:20px}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important;top:100px !important}.el-message--info .el-icon-info{display:none}.el-message--info .el-message__content{color:#fff !important}.pagex{padding:20px}.pagex .el-input__inner{height:38px;border-radius:2px;border:1px solid #BEC9DF;font-size:14px}.pagex .el-input__inner:focus{border:1px solid #387FFF}.pagex .el-form-item__label{color:#666}.pagex .el-range-editor.el-input__inner{width:257px}.pagex .el-select .el-input.is-focus .el-input__inner,.pagex .el-range-editor.is-active,.pagex .el-range-editor.is-active:hover{border-color:#387FFF}.pagex .el-select{width:100px}.pagex .el-form--inline .el-form-item{margin-right:30px}.pagex .el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.pagex .el-message--info .el-icon-info{display:none}.pagex .el-message--info .el-message__content{color:#fff !important}.pagex .el-input__inner{color:#333 !important}.pagex input::-webkit-input-placeholder{color:#A1ACC1 !important}.pagex .el-table,.pagex .el-table thead{color:#333}.pagex .el-checkbox__input.is-checked .el-checkbox__inner,.pagex .el-checkbox__input.is-indeterminate .el-checkbox__inner{background-color:#1969F9;border-color:#1969F9}.pagex .el-select .el-input__inner:focus{border-color:#C0C4CC}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header th{background-color:#F1F4FA}.pagex .el-table--enable-row-hover .el-table__body tr:hover>td,.pagex .el-table__body tr.hover-row.current-row>td,.pagex .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.pagex .el-table__body tr.hover-row.el-table__row--striped>td,.pagex .el-table__body tr.hover-row>td{background:#F1F8FF !important}.pagex .el-table__body-wrapper::-webkit-scrollbar{width:18px}.pagex .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:8px;background:#fff;width:18px;-webkit-box-shadow:inset 0 0 8px rgba(0,0,0,0.2)}.pagex .el-table__body-wrapper::-webkit-scrollbar-track{border-radius:0;background:#D2D9E7}.pagex .el-table td,.pagex .el-table th.is-leaf,.pagex .el-table--border,.pagex .el-table--group{border-color:#D2D9E7}.pagex .el-table--border::after,.pagex .el-table--group::after,.pagex .el-table::before{background-color:#D2D9E7}.pagex .el-table__fixed-body-wrapper{z-index:4}.zdypop .el-form-item__label{color:#333}.zdypop .el-input.is-disabled{background-color:#F1F4FA;border-color:#F1F4FA}.zdypop .el-input.is-disabled .el-input__inner{background-color:#F1F4FA;border-color:#F1F4FA}.el-cascader-panel{min-height:150px;max-height:300px}.placehoload .el-input__inner::-webkit-input-placeholder{color:#333}.el-tooltip__popper{box-shadow:1px 2px 10px 0 rgba(119,135,145,0.5);border:1px solid #387FFF !important;border-radius:0px !important}.el-tooltip__popper .boxxrth2021{width:150px;background:#fff;font-size:12px;color:#333}.el-tooltip__popper .boxxrth2021 p{height:28px;line-height:28px}.el-tooltip__popper .boxxrth2021 p span{width:50%}.el-tooltip__popper[x-placement="top"] .popper__arrow{border-top-color:#387FFF !important}.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#387FFF !important}.el-tooltip__popper.is-light[x-placement^=top] .popper__arrow{border-top-color:#387FFF !important}.el-tooltip__popper.is-light[x-placement^=bottom] .popper__arrow{border-bottom-color:#387FFF !important}.el-tooltip__popper.is-light[x-placement^=left] .popper__arrow{border-left-color:#387FFF !important}.el-dialog__body{padding:20px !important}.el-dialog__title{font-size:14px;color:#333;font-weight:bold;position:relative}.el-dialog__title::after{content:"";position:absolute;width:5px;height:22px;background:#1969F9;left:-20px;top:2px}.el-icon-close{font-size:24px}.el-icon-close:hover,.el-icon-close:focus{color:#1969F9 !important}.el-message-box__container{text-align:center;padding:15px 0px}.el-message-box__message{display:inline-block}.el-message-box__message p{color:#333;font-size:16px}.el-message-box__status.el-icon-error{color:#FC1F00 !important;font-size:25px !important}.el-message-box__close:before{content:"\E609"}.el-message-box__btns .el-button,.dialog-footer .el-button{width:76px;height:34px;text-align:center;line-height:34px;background:#E8ECF4;border:1px solid #E8ECF4;border-radius:2px;color:#8391AD;font-size:14px;padding:0px}.el-message-box__btns .el-button:hover,.dialog-footer .el-button:hover,.el-message-box__btns .el-button:focus,.dialog-footer .el-button:focus{color:#8391AD;background:#E8ECF4;border:1px solid #E8ECF4}.el-message-box__btns .el-button.el-button--primary,.dialog-footer .el-button.el-button--primary{border:1px solid #1969F9;color:#fff;background:#1969F9}.el-message-box__btns .el-button.el-button--primary:hover,.dialog-footer .el-button.el-button--primary:hover,.el-message-box__btns .el-button.el-button--primary:focus,.dialog-footer .el-button.el-button--primary:focus{color:#fff;background:#1969F9;border:1px solid #1969F9}.p-text{margin-bottom:6px}.p-text em{width:56px;text-align:left}.p-text span{width:214px;height:30px;background:#F1F4FA;border-radius:2px;font-size:14px;color:#333333;padding-left:7px;margin-left:8px;text-align:left}.popper-class-box .popper__arrow{left:20px !important}
\ No newline at end of file

src/components/menu.vue

@@ -18,7 +18,7 @@
           </div>
         </div>
         <div class="user-box fr">
-          <div class="line"></div>
+          <div class="line" style="margin-left:0px;"></div>
           <a class="msgh fl" href="javascript:history.go(0)">
             <span class="el-icon-refresh icon" style="position:relative;top:3px;"></span>
           </a>
@@ -490,23 +490,21 @@
         height: 40px;
         overflow-y: hidden;
         position: relative;
-        width: calc(100vw - 660px);
+        width: calc(100vw - 584px);
 
         &::-webkit-scrollbar {
-          width: 5px;
-          height: 3px;
+          height: 5px;
         }
 
         &::-webkit-scrollbar-thumb {
-          border-radius: 2px;
+          border-radius: 5px;
           background: #fff;
-          width: 5px;
           -webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
         }
 
         &::-webkit-scrollbar-track {
           border-radius: 0;
-          background: #D2D9E7;
+          background: rgba(0,0,0,0);
         }
 
         .item-boxs {
@@ -547,7 +545,11 @@
               }
             }
           }
-
+          &:hover{
+            font{
+              color:#1969F9;
+            }
+          }
           .icon {
             font-size: 14px;
             margin-left: 5px;
@@ -579,11 +581,13 @@
 
         .line {
           width: 1px;
-          height: 40px;
+          height: 30px;
           background: #E5EBF6;
           float: left;
-          margin-left: 30px;
-          margin-right: 30px;
+          margin-left: 15px;
+          margin-right: 15px;
+          position: relative;
+          top:5px;
         }
 
         .msgh {
@@ -614,7 +618,7 @@
             margin-left: 10px;
             margin-right: 10px;
             font-size: 12px;
-            max-width: 100px;
+            width: 100px;
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;

src/views/List/inquire.vue

@@ -20,10 +20,10 @@
                 <div class="fl dcg" @click="exportChange">导出</div>
                 <div class="fl dcg delbtn" @click="del">删除</div>
             </div>
-            <div class="data-box th-all">
+            <div class="data-box">
                 <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="40" align="center"></el-table-column>
-                    <el-table-column prop="inquiry_sn" label="询价单号" min-width="10%"></el-table-column>
+                    <el-table-column prop="inquiry_sn"  label="询价单号" min-width="10%"></el-table-column>
                     <el-table-column prop="goods_name" label="型号" min-width="10%">
                         <template slot-scope="scope">
                             <div class="p-copy">

src/views/List/inquireDetail.vue

@@ -4,29 +4,29 @@
       <p class="tit">询价信息</p>
       <div class="input-box clr">
         <div class="fl">
-          <span class="p-text">型号</span>
+          <span class="p-text">型号<font style="visibility:hidden;">型号</font></span>
           <input type="text" placeholder="" disabled :value="inquiry_info.goods_name"
-                 style="width: 176px;margin-right: 30px; " />
+                 style="width: 180px;margin-right: 30px; " />
         </div>
         <div class="fl">
-          <span class="p-text">品牌</span>
+          <span class="p-text">品牌<font style="visibility:hidden;">型号</font></span>
           <input type="text" placeholder="" disabled :value="inquiry_info.brand_name"
-                 style="width: 100px;margin-right: 30px; " />
+                 style="width: 180px;margin-right: 30px; " />
         </div>
         <div class="fl">
-          <span class="p-text">数量</span>
+          <span class="p-text">数量<font style="visibility:hidden;">型号</font></span>
           <input type="text" placeholder="" disabled :value="inquiry_info.inquiry_number"
-                 style="width: 100px ;margin-right: 30px;" />
+                 style="width: 180px ;margin-right: 30px;" />
         </div>
         <div class="fl">
-          <span class="p-text">批次</span>
+          <span class="p-text">批次<font style="visibility:hidden;">型号</font></span>
           <input type="text" placeholder="" disabled :value="inquiry_info.batch"
-                 style="width: 100px;margin-right: 30px; " />
+                 style="width: 180px;margin-right: 30px; " />
         </div>
         <div class="fl">
           <span class="p-text">交货日期</span>
           <input type="text" placeholder="" disabled :value="inquiry_info.delivery_time"
-                 style="width: 100px;margin-right: 30px; " />
+                 style="width: 180px;margin-right: 30px; " />
         </div>
 
         <div class="fl">
@@ -375,7 +375,7 @@
             message: '请选择品牌',
             trigger: 'blur'
           }],
-
+          
           quote_number: [{
             required: true,
             message: '请输入报价数量',

src/views/List/quote.vue

@@ -13,6 +13,7 @@
                         <el-option label="比价中" value="1"></el-option>
                         <el-option label="已确认" value="3"></el-option>
                         <el-option label="已成单" value="4"></el-option>
+                        <el-option label="已关闭" value="5"></el-option>
                     </el-select>
                 </el-form-item>
                  <el-form-item label="最近报价时间">
@@ -30,7 +31,7 @@
             <div class="data-box th-all">
                 <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
                     <el-table-column fixed type="selection" width="40" align="center"></el-table-column>
-                    <el-table-column prop="goods_name" label="型号" width="200">
+                    <el-table-column prop="goods_name" fixed="left" label="型号" width="200">
                         <template slot-scope="scope">
                             <div class="price-mores">
                                 <el-tooltip effect="light" placement="bottom-start" popper-class="popper-class-box">
@@ -61,7 +62,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="brand_name" label="品牌" width="200"></el-table-column>
+                    <el-table-column prop="brand_name" fixed="left" label="品牌" width="200"></el-table-column>
                     <el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column>
                     <el-table-column prop="quote_goods_name" label="报价型号" width="200"></el-table-column>
                     <el-table-column prop="quote_brand_name" label="报价品牌" width="200"></el-table-column>