Skip to content

肖康 / cloudSystem

Go to a project
Commit 0dab1f2a by 肖康
Options

Merge branch 'dev/ver/2.0.0' of http://git.ichunt.net/xiaokang/cloudSystem into dev/ver/2.0.0

parents 5d419b52 06e7af88
Inline Side-by-side
Showing with 85 additions and 156 deletions
src/assets/css/public/common.less
......@@ -190,47 +190,20 @@ body {
padding: 20px;
}
//js跟随提示框
.el-tooltip__popper {
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
border: 1px solid #387FFF !important;
border-radius: 0px !important;
.boxxrth2021 {
width: 150px;
background: #fff;
font-size: 12px;
color: #333;
p {
height: 28px;
line-height: 28px;
span {
width: 50%
.zdypop {
.el-form-item__label {
color: #333
}
}
}
}
.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-input.is-disabled {
background-color: #F1F4FA;
border-color: #F1F4FA
}
.el-tooltip__popper.is-light[x-placement^=left] .popper__arrow {
border-left-color: #387FFF !important
.el-input.is-disabled .el-input__inner {
background-color: #F1F4FA;
border-color: #F1F4FA
}
}
//弹窗公共样式
......
src/assets/css/public/common.min.css
......@@ -204,38 +204,16 @@ body {
.pagex {
padding: 20px;
}
.el-tooltip__popper {
box-shadow: 1px 2px 10px 0px 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;
.zdypop .el-form-item__label {
color: #333;
}
.el-tooltip__popper .boxxrth2021 p {
height: 28px;
line-height: 28px;
.zdypop .el-input.is-disabled {
background-color: #F1F4FA;
border-color: #F1F4FA;
}
.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;
.zdypop .el-input.is-disabled .el-input__inner {
background-color: #F1F4FA;
border-color: #F1F4FA;
}
.el-dialog__body {
padding: 20px !important;
......
src/assets/css/public/common.min.css.map
{"version":3,"sources":["common.less"],"names":[],"mappings":"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","file":"common.min.css"}
\ No newline at end of file
{"version":3,"sources":["common.less"],"names":[],"mappings":"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","file":"common.min.css"}
\ No newline at end of file
src/components/menu.vue
......@@ -4,13 +4,11 @@
<div class="con-box clr">
<div class="logo fl">云芯系统</div>
<div class="tab-box fl" ref="scrollbox">
<div class="item-boxs" ref="scrollboxinner" :style="'width:'+(tabs.length*95+48)+'px'">
<a class="item fl first" href="/#/" :class="{'act':$route.path=='/','scrollsg':rpcg}">
<div class="item-boxs row verCenter" ref="scrollboxinner">
<a class="item first row rowCenter verCenter" href="/#/" :class="{'act':$route.path=='/','scrollsg':rpcg}">
<font class="fl">概况</font>
</a>
<a class="item fl"
:class="{'scrollsg':rpcg,'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}"
@click="tabUrl(item)" v-for="item in tabs">
<a class="item row rowCenter verCenter" :class="{'scrollsg':rpcg,'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}" @click="tabUrl(item)" v-for="item in tabs">
<font class="fl">{{ item.title }}</font>
<span class="icon iconfont fl" @click.stop="closetab(item.path)"></span>
</a>
......@@ -25,8 +23,7 @@
<a href="/云芯操作手册.pdf" class="fl" target="_blank" title="操作手册"><span class="icon iconfont iconwendangguanli fl"></span></a>
<div class="line"></div>
<div class="login-v fl">
<img class="fl" :src="userinfo.avatar||'https://www.ichunt.com/v3/dist/res/home/images/headimg/boy1.png'"
alt="">
<img class="fl" :src="userinfo.avatar||'https://www.ichunt.com/v3/dist/res/home/images/headimg/boy1.png'" alt="">
<div class="fl namex">{{ userinfo.contacts_name || '猎芯网用户' }}</div>
<div class="fl lo-box-drop">
<span class="icon iconfont"></span>
......@@ -179,7 +176,7 @@
<script>
import Vue from 'vue';
import Util from "../tool";
import {Form, FormItem, Input, Menu, MenuItem, Submenu, MenuItemGroup, Message, Dialog, Button, Tooltip} from 'element-ui'
import {Button, Dialog, Form, FormItem, Input, Menu, MenuItem, MenuItemGroup, Message, Submenu, Tooltip} from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Menu).use(MenuItem).use(MenuItemGroup).use(Submenu).use(Form).use(FormItem).use(Dialog).use(Button).use(Tooltip).use(Input);
......@@ -472,21 +469,6 @@ export default {
position: relative;
width: calc(100vw - 584px);
&::-webkit-scrollbar {
height: 5px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #fff;
-webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
}
&::-webkit-scrollbar-track {
border-radius: 0;
background: rgba(0, 0, 0, 0);
}
.item-boxs {
position: absolute;
left: 0px;
......@@ -494,34 +476,38 @@ export default {
.item {
color: #646B78;
font-size: 14px;
margin-left: 20px;
font-size: 13px;
height: 40px;
line-height: 40px;
cursor: pointer;
transition: all 0.4s ease;
padding: 0 17px;
&.act {
background-color: #F1F4FA;
position: relative;
font {
color: #333;
color: #1969f9;
}
&::after {
content: "";
position: absolute;
bottom: -8px;
width: 32px;
height: 5px;
top: 0;
width: 100%;
height: 2px;
background: #1969F9;
left: 50%;
margin-left: -22px;
left: 0;
right: 0;
margin: 0 auto;
text-align: center;
}
&.first {
background-color: transparent;
&::after {
margin-left: -15px;
display: none;
}
}
}
......@@ -555,7 +541,7 @@ export default {
}
.icon {
font-size: 14px;
font-size: 13px;
margin-left: 5px;
}
}
......
src/views/Goods/brand.vue
......@@ -3,13 +3,11 @@
<div class="brand-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="品牌">
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="submit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="关键词">
<el-input v-model="formParam.keyword" placeholder="请输入关键词" @keyup.enter.native="submit" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">搜索</el-button>
</el-form-item>
......@@ -69,7 +67,6 @@
<el-input v-model="scope.row.remark" placeholder="点击修改"></el-input>
</template>
</el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer">
......@@ -86,15 +83,13 @@
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Tool from '../../tool'
import {Form, FormItem, Select, Option, Input, Button, Table, TableColumn, Message, MessageBox, Dialog, Pagination, Autocomplete} from 'element-ui'
import {Autocomplete, Button, Dialog, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Select, Table, TableColumn} from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Autocomplete)
Vue.use(TableColumn).use(Table)
export default {
name: "brand",
data() {
return {
dialogVisible: false,
......@@ -127,7 +122,7 @@ export default {
}).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
this.total = Number(res.data.total) || 0;
this.total = Number(res.data.count) || 0;
} else {
this.$message({
message: res.msg,
......
src/views/List/inquireDetail.vue
......@@ -41,7 +41,7 @@
<div class="btn-nav clr">
<el-button type="primary" @click="added">新增</el-button>
<el-button type="primary" @click="modify">修改</el-button>
<el-button type="danger" @click="del">删除</el-button>
<!-- <el-button type="danger" @click="del">删除</el-button>-->
</div>
<div class="data-box th-all">
<el-table :data="quote_list" border max-height="600" @selection-change="handleSelectionChange">
......@@ -60,7 +60,7 @@
</el-table-column>
<el-table-column prop="expire_status_val" label="是否有效" width="100"></el-table-column>
<el-table-column prop="quote_number" label="报价数量" width="100"></el-table-column>
<el-table-column prop="price_origin" label="价格" width="100">
<el-table-column prop="price_origin" label="价格" width="130" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.price_origin|floatZero }}</span>
</template>
......@@ -305,9 +305,9 @@
</el-input>
</el-form-item>
<el-form-item label="货期" prop="delivery_time_val" class="updatebox">
<el-input placeholder="" v-model="ruleForm.delivery_time_val" :value="ruleForm.delivery_time" @keyup.native="keyup(ruleForm.delivery_time_val)"></el-input>
<el-input placeholder="" v-model="ruleForm.delivery_time_val" :value="ruleForm.delivery_time_val"></el-input>
<div class="selectdw">
<el-select v-model="ruleForm.delivery_time_unit" placeholder="天" class="placehoload" @change="unitChange">
<el-select v-model="ruleForm.delivery_time_unit" placeholder="天" class="placehoload">
<el-option label="工作日" value="工作日"></el-option>
<el-option label="周" value="周"></el-option>
</el-select>
......@@ -571,8 +571,9 @@ export default {
});
},
getSkulist() {
//匹配库存
this.$http('get', "/api/sku/list", {
brand_id: this.inquiry_info.brand_id,
brand_name: this.inquiry_info.brand_name,
goods_name: this.inquiry_info.goods_name,
'goods_status/condition': 1,
goods_status: 1,
......@@ -599,6 +600,7 @@ export default {
}
},
checkBind(ids) {
if (ids) {
this.$http('get', "/api/quote/checkpinlist", {
inquiry_items_id: this.$route.query.id,
pin_type: (this.active == 1 ? 1 : 2),
......@@ -632,6 +634,7 @@ export default {
}
})
}
},
getHistory() {
console.log('历史报价')
......@@ -683,23 +686,6 @@ export default {
let date = row.create_time;
return dateTimeFormate(date);
},
keyup(val) {
if (this.ruleForm.delivery_time_unit == '工作日') {
if (val >= 6) {
this.ruleForm.delivery_time_val = 6;
}
this.ruleForm.delivery_time = this.ruleForm.delivery_time_val;
} else if (this.ruleForm.delivery_time_unit == '周') {
this.ruleForm.delivery_time = this.ruleForm.delivery_time_val * 7;
}
},
unitChange(val) {
if (val == '周') {
this.ruleForm.delivery_time = this.ruleForm.delivery_time_val * 7;
} else {
this.ruleForm.delivery_time = this.ruleForm.delivery_time_val;
}
},
currentChange(val) {
if (val == 1) {
this.ruleForm.tax_rate = '13%';
......@@ -707,14 +693,17 @@ export default {
this.ruleForm.tax_rate = '0%';
}
},
//提交
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (this.submitState) {
return
return;
}
if (valid) {
this.submitState = 1;
let submitData_ = JSON.parse(JSON.stringify(this.ruleForm))
//delivery_time重新组装delivery_time_val+delivery_time_unit;
this.ruleForm.delivery_time = this.ruleForm.delivery_time_val + this.ruleForm.delivery_time_unit;
let submitData_ = this.ruleForm;
if (submitData_.tax_rate == '13%') {
submitData_.tax_rate = 0.13
} else {
......@@ -722,6 +711,9 @@ export default {
}
this.$http('post', "/api/quote/save", submitData_).then(res => {
if (res.code == 0) {
this.getData();
//新增的时候不需要调用该接口
if (this.currentDataId != 0) {
this.$http('post', "/api/quote/pin", {
inquiry_items_id: this.ruleForm.inquiry_items_id,
pin_type: (this.active == 1 ? 1 : 2),
......@@ -739,6 +731,8 @@ export default {
type: 'warning'
});
}
})
}
if (this.active == 1) {
//历史报价
//this.getHistory()
......@@ -748,7 +742,6 @@ export default {
}
this.dialogVisible = false
this.submitState = 0;
})
} else {
this.$message(res.msg);
......@@ -764,6 +757,7 @@ export default {
}
});
},
//新增报价
added() {
this.title = '新增';
this.dialogVisible = true;
......@@ -782,6 +776,7 @@ export default {
this.$refs['ruleForm'].resetFields();
})
},
//修改报价
modify() {
var arr = [];
if (this.multipleSelection.length == 0) {
......@@ -825,9 +820,12 @@ export default {
this.ruleForm.brand_s = res.data.quote_info.brand_name;
this.ruleForm.price_origin = res.data.quote_info.price_origin;
this.ruleForm.tax_rate = Number(res.data.quote_info.tax_rate) * 100 + '%';
this.ruleForm.delivery_time = res.data.quote_info.delivery_time;
this.ruleForm.delivery_time_val = this.ruleForm.delivery_time;
this.ruleForm.delivery_time_unit = '天'
this.ruleForm.delivery_time_unit = this.ruleForm.delivery_time_unit;
this.ruleForm.moq = res.data.quote_info.moq;
this.ruleForm.remark = res.data.quote_info.remark;
if (res.data.quote_info.expire_time == '0000-00-00 00:00:00') {
......@@ -857,6 +855,7 @@ export default {
},
//删除报价
del() {
var arr = [];
if (this.multipleSelection.length == 0) {
......@@ -921,7 +920,7 @@ export default {
this.ruleForm.goods_name = datap_.goods_name;
this.ruleForm.batch = datap_.batch;
this.ruleForm.price_origin = datap_.price_origin;
this.ruleForm.brand = datap_.brand_name;
this.ruleForm.brand_name = datap_.brand_name;
let brand_ssaa = [{
brand_id: datap_.brand_id,
brand_name: datap_.brand_name
......
src/views/List/quote.vue
......@@ -30,18 +30,19 @@
<div class="data-box th-all">
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="40" align="center"></el-table-column>
<el-table-column prop="goods_name" fixed="left" label="型号" width="200">
<el-table-column prop="quote_sn" fixed="left" label="报价单号" width="200"></el-table-column>
<el-table-column prop="inquiry_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">
<div slot="content">
<el-popover effect="light" trigger="hover" placement="bottom-start" popper-class="popper-class-box">
<div>
<p class="p-text row verCenter">
<em class="row">型号</em>
<span class="row verCenter boxsiz">{{ scope.row.goods_name }}</span>
<span class="row verCenter boxsiz">{{ scope.row.inquiry_goods_name }}</span>
</p>
<p class="p-text row verCenter">
<em class="row">品牌</em>
<span class="row verCenter boxsiz">{{ scope.row.brand_name }}</span>
<span class="row verCenter boxsiz">{{ scope.row.inquiry_brand_name }}</span>
</p>
<p class="p-text row verCenter">
<em class="row">数量</em>
......@@ -56,24 +57,21 @@
<span class="row verCenter boxsiz">{{ scope.row.delivery_time }}</span>
</p>
</div>
<div class="more-search-btn">{{ scope.row.goods_name }}</div>
</el-tooltip>
<div slot="reference" class="more-search-btn">{{ scope.row.inquiry_goods_name }}</div>
</el-popover>
</div>
</template>
</el-table-column>
<el-table-column prop="brand_name" fixed="left" label="品牌" width="200"></el-table-column>
<el-table-column prop="inquiry_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>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">比价中</span>
<span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已确认</span>
<span v-else-if="scope.row.status==4">已成单</span>
<span v-else-if="scope.row.status==5" class="f-red1">已关闭</span>
<span v-else-if="scope.row.status==9" class="f-red1">已删除</span>
<span v-else-if="scope.row.status==-1" class="f-red1">已撤销</span>
<span v-if="scope.row.quote_status==1" class="f-green">确认中</span>
<span v-else-if="scope.row.quote_status==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.quote_status==3">已成单</span>
<span v-else-if="scope.row.quote_status==4" class="f-red1">已关闭</span>
</template>
</el-table-column>
<el-table-column prop="expire_status_val" label="是否有效" width="100"></el-table-column>
......@@ -96,7 +94,7 @@
</el-table-column>
<el-table-column prop="expire_time" label="报价有效期" width="200"></el-table-column>
<el-table-column prop="remark" label="备注" width="200"></el-table-column>
<el-table-column prop="create_time" label="最近报价时间" width="200"></el-table-column>
<el-table-column prop="quote_time" label="最近报价时间" width="200"></el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
......@@ -107,12 +105,12 @@
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Form, FormItem, Select, Option, Input, DatePicker, Button, Dropdown, DropdownMenu, DropdownItem, Table, TableColumn, MessageBox, Message, Dialog, Pagination, Autocomplete, Tooltip} from 'element-ui'
import {Form, FormItem, Select, Option, Input, DatePicker, Button, Dropdown, DropdownMenu, DropdownItem, Table, TableColumn, MessageBox, Message, Dialog, Pagination, Autocomplete, Tooltip,Popover} from 'element-ui'
import {NODE_ENVS} from "../../ajax";
import Tool from '../../tool'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip);
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip).use(Popover);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination);
export default {
......
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