Skip to content

肖康 / cloudSystem

Go to a project
Commit a81c85f9 by 梁建民
Options

Merge branch 'dev/ver/3.0.0' into 'master' 

css

See merge request !9
parents 6f7f12f1 8838876e
Inline Side-by-side
Showing with 146 additions and 60 deletions
src/components/menu.vue
......@@ -27,7 +27,7 @@
<span class="el-icon-refresh icon"></span>
</a>
<div class="line"></div>
<a href="/云芯操作手册.pdf" class="fl" target="_blank" title="操作手册"><span class="icon iconfont iconwendangguanli fl"></span></a>
<a @click="handbook" class="fl" href="javascript:;" title="操作手册"><span class="icon iconfont iconwendangguanli fl"></span></a>
<div class="line"></div>
<div class="login-v row verCenter">
<img :src="userinfo.avatar||'https://www.ichunt.com/v3/dist/res/home/images/headimg/boy1.png'" alt="">
......@@ -225,10 +225,10 @@
<span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).title }}</span>
<template v-if="JSON.parse(scope.row.msg_data).cate_id == 6">
<a style="color: #409EFF" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
<a style="color: #409EFF" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 7">
<a style="color: #1969F9" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
<a style="color: #1969F9" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 8">
<a style="color: #FF870E" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
......@@ -237,7 +237,7 @@
<a style="color: #FF0000" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else>
<a style="color: #409EFF" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
<a style="color: #409EFF" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
</template>
</el-table-column>
......@@ -264,6 +264,42 @@
<span>{{ noticeMsg.create_time }}</span>
</div>
</el-dialog>
<!--操作手册-->
<el-dialog title="系统Q&A" :visible.sync="dialogHandbookVisible" width="800px" class="demo-ruleForm handbook-layer">
<p class="handbook-t1">
云芯系统是猎芯科技最新推出的一套连接商家与终端客户的智能操作系统，集询报价管理、订单管理、库存管理、商品管理、数据统计等于一体，可帮助商家获得更多询价商机及快捷方便管理各自的型号库存信息；
云芯商家可在云芯系统上自主管理商品上传下架及商品报价；
终端客户订单需求，猎芯销售部和采购部通过询报价系统与云芯商家对接，实现云芯商家针对客户商机信息可进行自主报价、实现订单快速高效转化的过程。
</p>
<p class="handbook-t2">以下为系统板块介绍</p>
<div class="text">
<p class="tit row verCenter">概况板块-说明：</p>
<p class="tt">概况页面主要统计贵司上传的库存型号数量以及订单转化率，并且会展示【猎芯网】热搜型号排名（前50名）;</p>
</div>
<div class="text">
<p class="tit row verCenter">询报价管理板块-说明：</p>
<p class="tt">询报价管理页面主要是汇总来自【猎芯询报价】系统推送而来的询价单（订单商机），贵司可对这些询价单进行报价操作，参与到猎芯的询价单报价中；</p>
</div>
<div class="text">
<p class="tit row verCenter">订单追踪板块-说明：</p>
<p class="tt">订单追踪页面主要是展示贵司与猎芯合作的所有订单数据，包括猎芯与贵司签订的采购订单，贵司发出给猎芯的货品信息，猎芯与贵司产生的退货信息等；</p>
</div>
<div class="text">
<p class="tit row verCenter">库存管理板块-说明：</p>
<p class="tt">库存管理页面主要的功能是供贵司上传型号库存，上传后的型号库存将会自动展示在【猎芯网】进行售卖，并且将会自动参与【猎芯询报价】系统的询价单推送（商机推送）；贵司上传的型号，与猎芯客户询价的型号匹配上后，该询价信息则会同步至【询报价管理】板块，贵司可对该条询价单（商机）进行报价； 贵司也可将具有优势货源的型号信息上传至【优势物料】页面，上传后的型号也将会自动参与【猎芯询报价】系统的询价单推送（商机推送）；</p>
</div>
<div class="text">
<p class="tit row verCenter">数据统计板块-说明：</p>
<p class="tt">数据统计页面主要统计贵司上传的型号跟优势物料，所获得的【猎芯询报价】系统的询价单推送（商机推送）情况，及最终和猎芯成交订单的情况；</p>
</div>
<div class="text">
<p class="tit row verCenter">消息管理板块-说明：</p>
<p class="tt">消息管理页面主要展示猎芯推送给供应商的消息通知，包括云芯系统的更新通知，猎芯与供应商之间的消息公告等；</p>
</div>
</el-dialog>
<div class="welcome row rowCenter verCenter" v-if="dialogWelcome">
<img src="/welcome.png" alt="">
</div>
</div>
</template>
......@@ -303,6 +339,8 @@ export default {
tabSure: "",
tabs: "",
width: "",
dialogWelcome: false,
dialogHandbookVisible: false,
not_read_count: '',//未读消息
isIndeterminate: false,//对el-checkbox控制不完整的全选状态
checkAll: false,//标记是否全选
......@@ -378,8 +416,8 @@ export default {
var self = this
this.getData();//获取个人信息
this.tabUi();
this.getLatestMsg();//获取最新消息
this.getCategoryMsgList();//获取系统公告
this.getWelcome();
window.onresize = function () {
self.tabUi()
};
......@@ -389,6 +427,25 @@ export default {
},
methods: {
/**
* 欢迎
*/
getWelcome() {
var welcome = Util.getCookie('welcome') || '';
if (!welcome) {
Util.setCookie('welcome', true, 1);
this.dialogWelcome = true;
setTimeout(() => {
this.dialogWelcome = false;
this.getLatestMsg();//获取最新消息
this.getCategoryMsgList();//获取系统公告
}, 3000)
} else {
this.dialogWelcome = false;
this.getLatestMsg();//获取最新消息
this.getCategoryMsgList();//获取系统公告
}
},
/**
* 获取系统公告
*/
getCategoryMsgList() {
......@@ -710,6 +767,12 @@ export default {
this.page = val;
this.getNews();
},
/**
* 操作手册
*/
handbook() {
this.dialogHandbookVisible = true;
},
tabUi() {
let tab_arr = JSON.parse(sessionStorage.getItem('tabs'));
if (tab_arr) {
......@@ -1406,4 +1469,60 @@ export default {
.dialog-layer-notice .el-dialog__header {
border-bottom: 1px solid #E5EBF6;
}
.handbook-layer {
.el-dialog {
max-height: 600px;
overflow-y: auto;
}
.handbook-t1 {
border-bottom: 1px solid #E5EBF6;
padding-bottom: 10px;
}
.handbook-t2 {
font-size: 14px;
color: #409eff;
font-weight: bold;
padding: 15px 0;
}
.text {
margin-bottom: 20px;
box-shadow: 0px 2px 42px -8px rgba(206, 214, 219, 0.5);
.tit {
padding-left: 24px;
height: 40px;
background-color: #f1f5fa;
color: #409eff;
font-size: 14px;
}
.tt {
padding: 12px 12px 12px 24px;
font-size: 14px;
}
}
}
.welcome {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 99999999999999;
background: rgba(0, 0, 0, 0.3);
img {
position: relative;
width: 614px;
height: 394px;
object-fit: cover;
z-index: 99999999999998;
}
}
</style>
\ No newline at end of file
src/views/OrderTrack/invoice.vue
......@@ -54,61 +54,27 @@
<div class="data-box th-all" v-if="tableData">
<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 label="发货信息">
<el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="in_qty" label="到货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status_val" label="状态" min-width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="info" v-else-if="scope.row.status == -3 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">{{ scope.row.status_tips }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="shipping_name" label="物流公司" min-width="80" align="center"></el-table-column>
<el-table-column prop="create_name" label="创建人" min-width="100" align="center"></el-table-column>
<el-table-column prop="purchase_name" label="订单人员" min-width="100" align="center"></el-table-column>
<el-table-column prop="create_time" label="创建时间" width="150" align="center"></el-table-column>
</el-table-column>
<el-table-column label="质检信息">
<el-table-column prop="qc_type_val" label="质检结果" width="100">
<template slot-scope="scope">
<template v-if="scope.row.qc_type_val">
<span>{{ scope.row.qc_type_val }}</span>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">{{ scope.row.qc_type_tips }}</div>
</el-tooltip>
</template>
</template>
</el-table-column>
<el-table-column prop="package" label="封装" width="100" align="center"></el-table-column>
<el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column>
<el-table-column prop="" label="质检图片" width="100" align="center">
<template slot-scope="scope">
<template v-if="scope.row.is_upload_image == 0">-</template>
<template v-else>
<a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id)">查看图片</a>
</template>
</template>
</el-table-column>
<el-table-column prop="" label="质检附件" width="100" align="center">
<template slot-scope="scope">
<template v-if="scope.row.is_upload_attachment == 0">-</template>
<template v-else>
<a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id,2)">查看附件</a>
</template>
</template>
</el-table-column>
<el-table-column prop="qc_time" label="质检时间" width="150" align="center"></el-table-column>
<el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="in_qty" label="到货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status_val" label="状态" min-width="80" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="info" v-else-if="scope.row.status == -3 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">{{ scope.row.status_tips }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="shipping_name" label="物流公司" min-width="80" align="center"></el-table-column>
<el-table-column prop="create_name" label="创建人" min-width="100" align="center"></el-table-column>
<el-table-column prop="purchase_name" label="订单人员" min-width="100" align="center"></el-table-column>
<el-table-column prop="create_time" label="创建时间" width="150" align="center"></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>
......
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