Commit 32865fc1 by 肖康

x

parent 759f2b8d
......@@ -108,7 +108,7 @@
<el-table-column fixed prop="goods_name" label="型号" width="180"></el-table-column>
<el-table-column fixed prop="goods_sn" label="供应商内部型号编码" width="180"></el-table-column>
<el-table-column fixed prop="brand_name" label="品牌" width="180"></el-table-column>
<el-table-column prop="batch_sn" label="封装" width="180"></el-table-column>
<el-table-column prop="batch_sn" label="批次" width="180"></el-table-column>
<el-table-column prop="moq" label="起订量" width="150"></el-table-column>
<el-table-column prop="mpq" label="标准包装量" width="150"></el-table-column>
<el-table-column prop="stock" label="库存数量" width="150">
......@@ -439,7 +439,7 @@
var arr_ = this.tableData,
id_arr = []
for (var i = 0; i < arr_.length; i++) {
id_arr.push(arr_[i].id)
id_arr.push(arr_[i].spu_id)
}
this.checkBind(id_arr.join(","))
} else {
......@@ -453,28 +453,31 @@
pin_type: (this.active == 1 ? 1 : 2),
pin_obj_ids: ids
}).then(res => {
if (res.err_code === 0) {
if (res.data && res.data.bind_ids && res.data.bind_ids.length > 0) {
var arr_ = this.active == 1 ? this.historyList : this.tableData
var arr_ = this.active == 1 ? JSON.parse(JSON.stringify(this.historyList)) : JSON.parse(JSON.stringify(this.this.tableData))
for (var i = 0; i < arr_.length; i++) {
if (res.data.bind_ids.indexOf(String(arr_[i].id)) != -1) {
if (this.active == 1) {
this.historyList[i].disabled = true
arr_[i].disabled = true
this.historyList=arr_
} else {
this.tableData[i].disabled = true
arr_[i].disabled = true
this.tableData=arr_
}
} else {
if (this.active == 1) {
this.historyList[i].disabled = false
arr_[i].disabled = false
this.historyList=arr_
} else {
this.tableData[i].disabled = false
arr_[i].disabled = false
this.tableData=arr_
}
}
}
}
}
})
},
......@@ -514,6 +517,7 @@
},
tab(index) {
this.active = index;
console.log(this.active)
this.page = 1;
if (index == 1) {
......@@ -750,16 +754,30 @@
})
},
handle(index, row) {
console.log(row)
if (row.disabled) {
this.$message('已绑定,不能重复操作')
return
}
this.currentDataId = row.id
this.title = this.active == 1 ? '确认-历史报价' : '确认-匹配库存';
this.dialogVisible = true;
this.ruleForm.quote_id = '';
this.isModify = true;
if(this.active!=1){
//匹配库存 不请求接口
this.ruleForm.goods_name =row.goods_name;
this.ruleForm.batch =row.batch;
this.ruleForm.brand =row.brand_name;
this.ruleForm.brand_s = row.brand_name;
this.ruleForm.batch = row.batch_sn;
this.ruleForm.price_origin = row.cn_price;
this.ruleForm.moq = row.moq;
this.ruleForm.mpq = row.mpq;
return
}
this.$http('get', "/api/quote/getinfo", {
id: row.id
}).then(res => {
......
......@@ -56,7 +56,9 @@
</el-table-column>
<el-table-column fixed prop="brand_name" label="品牌" width="180">
</el-table-column>
<el-table-column prop="batch_sn" label="批次" width="180">
<el-table-column prop="encap" label="封装" width="180">
</el-table-column>
<el-table-column prop="batch_sn" label="批次" width="180">
</el-table-column>
<el-table-column prop="moq" label="起订量" width="150">
</el-table-column>
......
......@@ -6,12 +6,12 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="http://yunxin.liexindev.net/favicon.ico">
<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.9b614e41dcd41ced51f7.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.8f971d0c9c71e4e0c648.js" rel="preload" as="script"></head>
<body>
<noscript>
<strong>网络异常,请稍后加载</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
<script type="text/javascript" src="http://yunxin.liexindev.net/app.9b614e41dcd41ced51f7.js"></script></body>
<script type="text/javascript" src="http://yunxin.liexindev.net/app.8f971d0c9c71e4e0c648.js"></script></body>
</html>
This diff could not be displayed because it is too large.
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