Commit ad603c9d by 肖康

x

parent b73453ee
...@@ -316,6 +316,9 @@ body { ...@@ -316,6 +316,9 @@ body {
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
color: #A1ACC1!important; color: #A1ACC1!important;
} }
.placehoload input::-webkit-input-placeholder {
color: #333!important;
}
.el-table,.el-table thead { .el-table,.el-table thead {
color: #333; color: #333;
} }
......
...@@ -606,9 +606,10 @@ ...@@ -606,9 +606,10 @@
// this.$message(res.err_msg); // this.$message(res.err_msg);
} }
this.$message('操作成功'); this.$message('操作成功');
this.getData()
if (this.active == 1) { if (this.active == 1) {
//历史报价 //历史报价
this.getHistory() //this.getHistory()
} else { } else {
//库存匹配 //库存匹配
this.getSkulist() this.getSkulist()
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="formInline.status" placeholder="请选择"> <el-select v-model="formInline.status" placeholder="请选择">
<el-option label="比价中" value="1"></el-option> <el-option label="比价中" value="1"></el-option>
<el-option label="已选中" value="2"></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-option label="已关闭" value="5"></el-option>
......
...@@ -439,11 +439,13 @@ ...@@ -439,11 +439,13 @@
var arr_ = {} var arr_ = {}
var self = this; var self = this;
for (var i = 0; i < self.huoqidata.length; i++) { for (var i = 0; i < self.huoqidata.length; i++) {
arr_[self.huoqidata[i]['goods_id']] = { arr_[self.huoqidata[i]['goods_id']]={}
cn_delivery_time: self.huoqidata[i]['dlhq'] + (self.huoqidata[i]['dlhqdw'] || '天'), if(self.huoqidata[i]['dlhq']&&self.huoqidata[i]['dlhq']!='undefined'){
hk_delivery_time: self.huoqidata[i]['hkhq'] + (self.huoqidata[i]['hkhqdw'] || '天') arr_[self.huoqidata[i]['goods_id']].cn_delivery_time=self.huoqidata[i]['dlhq'] + ((self.huoqidata[i]['dlhqdw']&&self.huoqidata[i]['dlhqdw']!='天' )?'周':'工作日')
}
if(self.huoqidata[i]['hkhq']&&self.huoqidata[i]['hkhq'] !='undefined'){
arr_[self.huoqidata[i]['goods_id']].hk_delivery_time=self.huoqidata[i]['hkhq'] + ((self.huoqidata[i]['hkhqdw'] &&self.huoqidata[i]['hkhqdw']!='天')?'周':'工作日')
} }
} }
console.log(arr_) console.log(arr_)
this.$http('post', "/api/sku/updateSku", arr_).then(res => { this.$http('post', "/api/sku/updateSku", arr_).then(res => {
......
...@@ -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.df8ae05cf22eff5bbd0b.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.bb808fb84e71c01f8d5f.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.df8ae05cf22eff5bbd0b.js"></script></body> <script type="text/javascript" src="http://yunxin.liexindev.net/app.bb808fb84e71c01f8d5f.js"></script></body>
</html> </html>
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