Skip to content

肖康 / cloudSystem

Go to a project
Commit 6bd03cda by 肖康
Options

x

parent a2a10870
Inline Side-by-side
Showing with 24 additions and 13 deletions
src/views/List/inquireDetail.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<el-table-column prop="brand_name" label="报价品牌" width="200"></el-table-column> <el-table-column prop="brand_name" label="报价品牌" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100"> <el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">已报价</span> <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==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已确认</span> <span v-else-if="scope.row.status==3">已确认</span>
<span v-else-if="scope.row.status==5" class="f-red1">已关闭</span> <span v-else-if="scope.row.status==5" class="f-red1">已关闭</span>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<!--匹配库存--> <!--匹配库存-->
<template v-if="active==0"> <template v-if="active==0">
<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 label="操作" width="108" align="center" v-if="'show'"> <el-table-column fixed label="操作" width="108" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span class="dcg" :class="{'disabled':scope.row.disabled}" <span class="dcg" :class="{'disabled':scope.row.disabled}"
@click="handle(scope.$index, scope.row)">确认</span> @click="handle(scope.$index, scope.row)">确认</span>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<el-table-column prop="cn_delivery_time" label="大陆交期" width="150"></el-table-column> <el-table-column prop="cn_delivery_time" label="大陆交期" width="150"></el-table-column>
<el-table-column prop="hk_delivery_time" label="香港交期" width="150"> <el-table-column prop="hk_delivery_time" label="香港交期" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="goods_status" label="状态" width="150" v-if="'show'"> <el-table-column prop="goods_status" label="状态" width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.goods_status==1" class="f-green">上架</span> <span v-if="scope.row.goods_status==1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status==3">下架</span> <span v-else-if="scope.row.goods_status==3">下架</span>
...@@ -161,9 +161,9 @@ ...@@ -161,9 +161,9 @@
@current-change="handleCurrentChange" :current-page="page"></el-pagination> @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</template> </template>
<!--历史报价--> <!--历史报价-->
<template v-else-if="active==1"> <template v-else>
<el-table :data="historyList" border style="width: 100%"> <el-table :data="historyList" border style="width: 100%">
<el-table-column fixed label="操作" width="108" align="center" v-if="'show'"> <el-table-column fixed label="操作" width="108" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <span class="dcg disabled" @click="handle(scope.$index, scope.row)">确认</span> --> <!-- <span class="dcg disabled" @click="handle(scope.$index, scope.row)">确认</span> -->
<span class="dcg " :class="{'disabled':scope.row.disabled}" <span class="dcg " :class="{'disabled':scope.row.disabled}"
...@@ -172,9 +172,9 @@ ...@@ -172,9 +172,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="goods_name" label="报价型号" width="200"></el-table-column> <el-table-column prop="goods_name" label="报价型号" width="200"></el-table-column>
<el-table-column prop="brand_name" label="报价品牌" width="200"></el-table-column> <el-table-column prop="brand_name" label="报价品牌" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100" v-if="'show'"> <el-table-column prop="status" label="状态" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">已报价</span> <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==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已确认</span> <span v-else-if="scope.row.status==3">已确认</span>
<span v-else-if="scope.row.status==5" class="f-red1">已关闭</span> <span v-else-if="scope.row.status==5" class="f-red1">已关闭</span>
...@@ -437,11 +437,13 @@ ...@@ -437,11 +437,13 @@
this.$http('get', "/api/sku/list", { this.$http('get', "/api/sku/list", {
brand_id: this.inquiry_info.brand_id, brand_id: this.inquiry_info.brand_id,
goods_name: this.inquiry_info.goods_name, goods_name: this.inquiry_info.goods_name,
'goods_status/condition':1,
goods_status: 1, goods_status: 1,
}).then(res => { }).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.tableData = res.data.list || []; this.tableData = res.data.list || [];
this.total = Number(res.data.count) || 0; this.total = Number(res.data.count) || 0;
var arr_ = this.tableData, var arr_ = this.tableData,
id_arr = [] id_arr = []
for (var i = 0; i < arr_.length; i++) { for (var i = 0; i < arr_.length; i++) {
...@@ -484,6 +486,7 @@ ...@@ -484,6 +486,7 @@
} }
} }
} }
}) })
}, },
...@@ -528,7 +531,7 @@ ...@@ -528,7 +531,7 @@
if (index == 1) { if (index == 1) {
this.getHistory(); this.getHistory();
} else if (index == 1) { } else {
this.getSkulist(); this.getSkulist();
} }
}, },
...@@ -589,9 +592,17 @@ ...@@ -589,9 +592,17 @@
// this.$message(res.err_msg); // this.$message(res.err_msg);
} }
this.$message('操作成功'); this.$message('操作成功');
setTimeout(() => { if(this.active == 1){
window.location.reload(); //历史报价
}, 2000) this.historyList()
}else{
//库存匹配
this.getSkulist()
}
this.dialogVisible=false
// setTimeout(() => {
// window.location.reload();
// }, 2000)
// loadingInstance.close(); // loadingInstance.close();
this.submitState = 0; this.submitState = 0;
}) })
......
view/index.html
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="http://yunxin.liexindev.net/favicon.ico"> <link rel="icon" href="http://yunxin.liexindev.net/favicon.ico">
<title>cloudsystem</title> <title>cloudsystem</title>
<link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/26.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/27.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/28.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.568cab057f3f77b53e87.js" rel="preload" as="script"></head> <link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/26.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/27.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/28.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.1964ecb61f36e2d3ce32.js" rel="preload" as="script"></head>
<body> <body>
<noscript> <noscript>
<strong>网络异常,请稍后加载</strong> <strong>网络异常,请稍后加载</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script type="text/javascript" src="http://yunxin.liexindev.net/app.568cab057f3f77b53e87.js"></script></body> <script type="text/javascript" src="http://yunxin.liexindev.net/app.1964ecb61f36e2d3ce32.js"></script></body>
</html> </html>
view/js/14.js
This diff could not be displayed because it is too large.
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