Skip to content

肖康 / cloudSystem

Go to a project
Commit d8f645ed by 肖康
Options

x

parent 9f6bbb51
Expand all
Inline Side-by-side
Showing with 34 additions and 29 deletions
src/ajax/index.js
...@@ -15,7 +15,7 @@ export let NODE_ENVS = "/"; ...@@ -15,7 +15,7 @@ export let NODE_ENVS = "/";
switch (envs) { switch (envs) {
case 'development': case 'development':
//开发环境 //开发环境
NODE_ENVS = 'http://192.168.2.251:8080'; NODE_ENVS = 'http://192.168.1.251:8080';
break; break;
case 'test': case 'test':
//测试环境 //测试环境
......
src/assets/css/public/common.less
...@@ -338,8 +338,8 @@ body { ...@@ -338,8 +338,8 @@ body {
background-color: #F1F4FA 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{ .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; background: #F1F8FF!important;
} }
.el-table__body-wrapper::-webkit-scrollbar { .el-table__body-wrapper::-webkit-scrollbar {
......
src/components/menu.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="user-box fr"> <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)"> <a class="msgh fl" href="javascript:history.go(0)">
<span class="el-icon-refresh icon" style="position:relative;top:3px;"></span> <span class="el-icon-refresh icon" style="position:relative;top:3px;"></span>
</a> </a>
...@@ -490,23 +490,21 @@ ...@@ -490,23 +490,21 @@
height: 40px; height: 40px;
overflow-y: hidden; overflow-y: hidden;
position: relative; position: relative;
width: calc(100vw - 660px); width: calc(100vw - 584px);
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 5px; height: 5px;
height: 3px;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
border-radius: 2px; border-radius: 5px;
background: #fff; background: #fff;
width: 5px;
-webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
} }
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {
border-radius: 0; border-radius: 0;
background: #D2D9E7; background: rgba(0,0,0,0);
} }
.item-boxs { .item-boxs {
...@@ -547,7 +545,11 @@ ...@@ -547,7 +545,11 @@
} }
} }
} }
&:hover{
font{
color:#1969F9;
}
}
.icon { .icon {
font-size: 14px; font-size: 14px;
margin-left: 5px; margin-left: 5px;
...@@ -579,11 +581,13 @@ ...@@ -579,11 +581,13 @@
.line { .line {
width: 1px; width: 1px;
height: 40px; height: 30px;
background: #E5EBF6; background: #E5EBF6;
float: left; float: left;
margin-left: 30px; margin-left: 15px;
margin-right: 30px; margin-right: 15px;
position: relative;
top:5px;
} }
.msgh { .msgh {
...@@ -614,7 +618,7 @@ ...@@ -614,7 +618,7 @@
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
font-size: 12px; font-size: 12px;
max-width: 100px; width: 100px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
......
src/views/List/inquire.vue
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<div class="fl dcg" @click="exportChange">导出</div> <div class="fl dcg" @click="exportChange">导出</div>
<div class="fl dcg delbtn" @click="del">删除</div> <div class="fl dcg delbtn" @click="del">删除</div>
</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 :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40" align="center"></el-table-column> <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%"> <el-table-column prop="goods_name" label="型号" min-width="10%">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="p-copy"> <div class="p-copy">
......
src/views/List/inquireDetail.vue
...@@ -4,29 +4,29 @@ ...@@ -4,29 +4,29 @@
<p class="tit">询价信息</p> <p class="tit">询价信息</p>
<div class="input-box clr"> <div class="input-box clr">
<div class="fl"> <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" <input type="text" placeholder="" disabled :value="inquiry_info.goods_name"
style="width: 176px;margin-right: 30px; " /> style="width: 180px;margin-right: 30px; " />
</div> </div>
<div class="fl"> <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" <input type="text" placeholder="" disabled :value="inquiry_info.brand_name"
style="width: 100px;margin-right: 30px; " /> style="width: 180px;margin-right: 30px; " />
</div> </div>
<div class="fl"> <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" <input type="text" placeholder="" disabled :value="inquiry_info.inquiry_number"
style="width: 100px ;margin-right: 30px;" /> style="width: 180px ;margin-right: 30px;" />
</div> </div>
<div class="fl"> <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" <input type="text" placeholder="" disabled :value="inquiry_info.batch"
style="width: 100px;margin-right: 30px; " /> style="width: 180px;margin-right: 30px; " />
</div> </div>
<div class="fl"> <div class="fl">
<span class="p-text">交货日期</span> <span class="p-text">交货日期</span>
<input type="text" placeholder="" disabled :value="inquiry_info.delivery_time" <input type="text" placeholder="" disabled :value="inquiry_info.delivery_time"
style="width: 100px;margin-right: 30px; " /> style="width: 180px;margin-right: 30px; " />
</div> </div>
<div class="fl"> <div class="fl">
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
message: '请选择品牌', message: '请选择品牌',
trigger: 'blur' trigger: 'blur'
}], }],
quote_number: [{ quote_number: [{
required: true, required: true,
message: '请输入报价数量', message: '请输入报价数量',
......
src/views/List/quote.vue
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<el-option label="比价中" value="1"></el-option> <el-option label="比价中" value="1"></el-option>
<el-option label="已确认" value="3"></el-option> <el-option label="已确认" value="3"></el-option>
<el-option label="已成单" value="4"></el-option> <el-option label="已成单" value="4"></el-option>
<el-option label="已关闭" value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="最近报价时间"> <el-form-item label="最近报价时间">
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
<div class="data-box th-all"> <div class="data-box th-all">
<el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange"> <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 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"> <template slot-scope="scope">
<div class="price-mores"> <div class="price-mores">
<el-tooltip effect="light" placement="bottom-start" popper-class="popper-class-box"> <el-tooltip effect="light" placement="bottom-start" popper-class="popper-class-box">
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
</div> </div>
</template> </template>
</el-table-column> </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="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_goods_name" label="报价型号" width="200"></el-table-column>
<el-table-column prop="quote_brand_name" label="报价品牌" width="200"></el-table-column> <el-table-column prop="quote_brand_name" label="报价品牌" width="200"></el-table-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment