Skip to content

肖康 / cloudSystem

Go to a project
Commit 5ffe1914 by LJM
Options

js

parent 83dfe960
Inline Side-by-side
Showing with 24 additions and 65 deletions
src/views/List/inquireDetail.vue
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<div class="btn-nav clr"> <div class="btn-nav clr">
<el-button type="primary" @click="added">新增</el-button> <el-button type="primary" @click="added">新增</el-button>
<el-button type="primary" @click="modify">修改</el-button> <el-button type="primary" @click="modify">修改</el-button>
<!-- <el-button type="danger" @click="del">删除</el-button>-->
</div> </div>
<div class="data-box th-all"> <div class="data-box th-all">
<el-table :data="quote_list" border max-height="600" @selection-change="handleSelectionChange"> <el-table :data="quote_list" border max-height="600" @selection-change="handleSelectionChange">
...@@ -305,9 +304,9 @@ ...@@ -305,9 +304,9 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="货期" prop="delivery_time_val" class="updatebox"> <el-form-item label="货期" prop="delivery_time_val" class="updatebox">
<el-input placeholder="" v-model="ruleForm.delivery_time_val" :value="ruleForm.delivery_time_val"></el-input> <el-input placeholder="货期" v-model="ruleForm.delivery_int" :value="ruleForm.delivery_int"></el-input>
<div class="selectdw"> <div class="selectdw">
<el-select v-model="ruleForm.delivery_time_unit" placeholder="天" class="placehoload"> <el-select v-model="ruleForm.delivery_unit_val" placeholder="天" class="placehoload">
<el-option label="工作日" value="工作日"></el-option> <el-option label="工作日" value="工作日"></el-option>
<el-option label="周" value="周"></el-option> <el-option label="周" value="周"></el-option>
</el-select> </el-select>
...@@ -389,9 +388,8 @@ export default { ...@@ -389,9 +388,8 @@ export default {
brand_name: '', brand_name: '',
price_origin: '', price_origin: '',
tax_rate: '13%', tax_rate: '13%',
delivery_time: '', delivery_int: '',
delivery_time_val: '', delivery_unit_val: '工作日',
delivery_time_unit: '工作日',
moq: '', moq: '',
expire_time: '', expire_time: '',
remark: '' remark: ''
...@@ -402,11 +400,6 @@ export default { ...@@ -402,11 +400,6 @@ export default {
message: '请输入报价型号', message: '请输入报价型号',
trigger: 'blur' trigger: 'blur'
}], }],
brand_s: [{
required: true,
message: '请选择品牌',
trigger: ['blur', 'change']
}],
quote_number: [{ quote_number: [{
required: true, required: true,
message: '请输入报价数量', message: '请输入报价数量',
...@@ -427,7 +420,7 @@ export default { ...@@ -427,7 +420,7 @@ export default {
message: '请输入价格', message: '请输入价格',
trigger: 'blur' trigger: 'blur'
},], },],
delivery_time_val: [{ delivery_int: [{
required: true, required: true,
message: '请输入货期', message: '请输入货期',
trigger: 'blur' trigger: 'blur'
...@@ -497,7 +490,6 @@ export default { ...@@ -497,7 +490,6 @@ export default {
}); });
return false; return false;
} }
if (type == 1) { if (type == 1) {
val = val.toString(); val = val.toString();
val = val.substring(val.length - 2); val = val.substring(val.length - 2);
...@@ -629,15 +621,12 @@ export default { ...@@ -629,15 +621,12 @@ export default {
} }
} }
} }
} }
} }
}) })
} }
}, },
getHistory() { getHistory() {
console.log('历史报价')
this.$http('get', "/api/quote/history", { this.$http('get', "/api/quote/history", {
page: this.page, page: this.page,
limit: this.limit, limit: this.limit,
...@@ -648,8 +637,7 @@ export default { ...@@ -648,8 +637,7 @@ export default {
if (res.code === 0) { if (res.code === 0) {
this.total = res.data.total; this.total = res.data.total;
this.historyList = res.data.list || []; this.historyList = res.data.list || [];
var arr_ = this.historyList, var arr_ = this.historyList, id_arr = []
id_arr = []
for (var i = 0; i < arr_.length; i++) { for (var i = 0; i < arr_.length; i++) {
id_arr.push(arr_[i].id) id_arr.push(arr_[i].id)
} }
...@@ -672,7 +660,6 @@ export default { ...@@ -672,7 +660,6 @@ export default {
}, },
tab(index) { tab(index) {
this.active = index; this.active = index;
console.log(this.active)
this.page = 1; this.page = 1;
this.$forceUpdate(); this.$forceUpdate();
...@@ -701,8 +688,6 @@ export default { ...@@ -701,8 +688,6 @@ export default {
} }
if (valid) { if (valid) {
this.submitState = 1; this.submitState = 1;
//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; let submitData_ = this.ruleForm;
if (submitData_.tax_rate == '13%') { if (submitData_.tax_rate == '13%') {
submitData_.tax_rate = 0.13 submitData_.tax_rate = 0.13
...@@ -744,7 +729,10 @@ export default { ...@@ -744,7 +729,10 @@ export default {
this.submitState = 0; this.submitState = 0;
} else { } else {
this.$message(res.msg); this.$message({
message: res.msg,
type: 'errow'
});
this.submitState = 0; this.submitState = 0;
} }
...@@ -752,7 +740,6 @@ export default { ...@@ -752,7 +740,6 @@ export default {
this.submitState = 0; this.submitState = 0;
}); });
} else { } else {
console.log(this.ruleForm.delivery_time);
return false; return false;
} }
}); });
...@@ -762,7 +749,7 @@ export default { ...@@ -762,7 +749,7 @@ export default {
this.title = '新增'; this.title = '新增';
this.dialogVisible = true; this.dialogVisible = true;
this.isModify = false; this.isModify = false;
this.ruleForm.brand = ''; this.ruleForm.brand_name = '';
this.ruleForm.tax_rate = '13%'; this.ruleForm.tax_rate = '13%';
this.ruleForm.moq = ''; this.ruleForm.moq = '';
this.ruleForm.mpq = ''; this.ruleForm.mpq = '';
...@@ -778,7 +765,7 @@ export default { ...@@ -778,7 +765,7 @@ export default {
}, },
//修改报价 //修改报价
modify() { modify() {
var arr = []; var arr = []; //quote_id集合
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: '请至少选择一条询价信息', message: '请至少选择一条询价信息',
...@@ -796,9 +783,9 @@ export default { ...@@ -796,9 +783,9 @@ export default {
} }
if (this.multipleSelection[0].status == 1 || this.multipleSelection[0].status == 3) { if (this.multipleSelection[0].status == 1 || this.multipleSelection[0].status == 3) {
for (var i = 0; i < this.multipleSelection.length; i++) { arr = this.multipleSelection.map(obj => {
arr.push(this.multipleSelection[i]['id']) return obj.id;
} });
this.title = '修改'; this.title = '修改';
this.dialogVisible = true; this.dialogVisible = true;
this.ruleForm.quote_id = arr.join(","); this.ruleForm.quote_id = arr.join(",");
...@@ -816,15 +803,12 @@ export default { ...@@ -816,15 +803,12 @@ export default {
this.ruleForm.mpq = res.data.quote_info.mpq; this.ruleForm.mpq = res.data.quote_info.mpq;
this.ruleForm.price_other = res.data.quote_info.price_other; this.ruleForm.price_other = res.data.quote_info.price_other;
this.ruleForm.unit = res.data.quote_info.unit; this.ruleForm.unit = res.data.quote_info.unit;
this.ruleForm.brand = res.data.quote_info.brand_name; this.ruleForm.brand_name = res.data.quote_info.brand_name;
this.ruleForm.brand_s = res.data.quote_info.brand_name;
this.ruleForm.price_origin = res.data.quote_info.price_origin; this.ruleForm.price_origin = res.data.quote_info.price_origin;
this.ruleForm.tax_rate = Number(res.data.quote_info.tax_rate) * 100 + '%'; 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_int = res.data.delivery_int;
this.ruleForm.delivery_time_val = this.ruleForm.delivery_time; this.ruleForm.delivery_unit_val = res.data.delivery_unit_val;
this.ruleForm.delivery_time_unit = this.ruleForm.delivery_time_unit;
this.ruleForm.moq = res.data.quote_info.moq; this.ruleForm.moq = res.data.quote_info.moq;
this.ruleForm.remark = res.data.quote_info.remark; this.ruleForm.remark = res.data.quote_info.remark;
...@@ -833,13 +817,6 @@ export default { ...@@ -833,13 +817,6 @@ export default {
} else { } else {
this.ruleForm.expire_time = res.data.quote_info.expire_time; this.ruleForm.expire_time = res.data.quote_info.expire_time;
} }
let brand_ss = [{
brand_id: '',
brand_name: ''
}];
brand_ss[0].brand_id = res.data.quote_info.brand_id;
brand_ss[0].brand_name = res.data.quote_info.brand_name;
this.ruleForm.brand_s = JSON.stringify(brand_ss);
} else { } else {
this.$message({ this.$message({
message: res.msg, message: res.msg,
...@@ -847,13 +824,10 @@ export default { ...@@ -847,13 +824,10 @@ export default {
}); });
} }
}) })
} else { } else {
this.$message("该报价不可修改"); this.$message("该报价不可修改");
return; return;
} }
}, },
//删除报价 //删除报价
del() { del() {
...@@ -921,11 +895,6 @@ export default { ...@@ -921,11 +895,6 @@ export default {
this.ruleForm.batch = datap_.batch; this.ruleForm.batch = datap_.batch;
this.ruleForm.price_origin = datap_.price_origin; this.ruleForm.price_origin = datap_.price_origin;
this.ruleForm.brand_name = datap_.brand_name; this.ruleForm.brand_name = datap_.brand_name;
let brand_ssaa = [{
brand_id: datap_.brand_id,
brand_name: datap_.brand_name
}]
this.ruleForm.brand_s = JSON.stringify(brand_ssaa);
this.ruleForm.moq = datap_.moq; this.ruleForm.moq = datap_.moq;
this.ruleForm.mpq = datap_.mpq; this.ruleForm.mpq = datap_.mpq;
this.ruleForm.quote_number = datap_.quote_number; this.ruleForm.quote_number = datap_.quote_number;
...@@ -949,32 +918,22 @@ export default { ...@@ -949,32 +918,22 @@ export default {
this.ruleForm.price_other = res.data.quote_info.price_other; this.ruleForm.price_other = res.data.quote_info.price_other;
this.ruleForm.unit = res.data.quote_info.unit; this.ruleForm.unit = res.data.quote_info.unit;
this.ruleForm.brand = res.data.quote_info.brand_name; this.ruleForm.brand = res.data.quote_info.brand_name;
this.ruleForm.brand_s = res.data.quote_info.brand_name;
this.ruleForm.price_origin = res.data.quote_info.price_origin; this.ruleForm.price_origin = res.data.quote_info.price_origin;
this.ruleForm.tax_rate = res.data.quote_info.tax_rate; this.ruleForm.tax_rate = res.data.quote_info.tax_rate;
this.ruleForm.delivery_time = res.data.quote_info.delivery_time; this.ruleForm.delivery_int = res.data.delivery_int;
this.ruleForm.delivery_time_val = this.ruleForm.delivery_time; this.ruleForm.delivery_unit_val = res.data.delivery_unit_val;
this.ruleForm.delivery_time_unit = '天';
this.ruleForm.moq = res.data.quote_info.moq; this.ruleForm.moq = res.data.quote_info.moq;
this.ruleForm.remark = res.data.quote_info.remark; this.ruleForm.remark = res.data.quote_info.remark;
if (res.data.quote_info.expire_time == '0000-00-00 00:00:00') { if (res.data.quote_info.expire_time == '0000-00-00 00:00:00') {
this.ruleForm.expire_time = ''; this.ruleForm.expire_time = '';
} else { } else {
this.ruleForm.expire_time = res.data.quote_info.expire_time; this.ruleForm.expire_time = res.data.quote_info.expire_time;
} }
let brand_ss = [{
brand_id: '',
brand_name: ''
}];
brand_ss[0].brand_id = res.data.quote_info.brand_id;
brand_ss[0].brand_name = res.data.quote_info.brand_name;
this.ruleForm.brand_s = JSON.stringify(brand_ss);
} else { } else {
this.$message(res.msg); this.$message({
message: res.msg,
type: 'error'
});
} }
}) })
} }
......
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