Commit 413d0988 by LJM

Merge branch 'dev/ver/2.0.0'

parents ffc11a96 3e254678
<template>
<div id="app">
<keep-alive exclude="InquireDetail,ListDetail,orderTrackGoodsDetail,orderTrackPurAdd,enter">
<keep-alive exclude="InquireDetail,ListDetail,orderTrackGoodsDetail,orderTrackPurAdd,enter,list,inquire,quote">
<router-view class="router-view"></router-view>
</keep-alive>
</div>
......
<template>
<div class="brandxk pagex">
<div class="brand-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="品牌">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="品牌" prop="brand_name">
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="submit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="关键词">
<el-form-item label="关键词" prop="keyword">
<el-input v-model="formParam.keyword" placeholder="请输入关键词" @keyup.enter.native="submit" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -186,6 +187,10 @@ export default {
}
})
},
resetForm(formName) {
this.formParam.date='';
this.$refs[formName].resetFields();
},
submit() {
if (this.formParam.keyword && this.formParam.keyword.length == 1) {
this.$message("关键词不能少于2个字符");
......
<template>
<div class="goods pagex">
<div class="goods-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="型号">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="型号" prop="goods_name">
<el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="品牌">
<el-form-item label="品牌" prop="brand_name">
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="分类">
<el-cascader expand-trigger="hover" placeholder="试试搜索:分类" :options="options" filterable @change="handleChange"></el-cascader>
<el-cascader clearable expand-trigger="hover" placeholder="试试搜索:分类" :options="options" filterable @change="handleChange"></el-cascader>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -99,7 +100,7 @@ export default {
page: 1,
downHref: "",
formParam: {
goods_name: 'ISL29035IROZ-T7',
goods_name: '',
brand_name: '',
keyword: '',
class_id2: '',
......@@ -249,6 +250,9 @@ export default {
}
})
},
resetForm(formName) {
this.$refs[formName].resetFields();
},
submit() {
this.page = 1;
this.getData();
......
......@@ -5,32 +5,22 @@
<li class="boxsiz">
<p class="top row bothSide verCenter">
<span class="t1">SKU数</span>
<em class="t2 row rowCenter verCenter boxsiz"></em>
</p>
<p class="cen row rowCenter">
<span class="t1">上架</span>
<span class="t2">{{ data.weekly_sku_count }}</span>
</p>
<p class="bottom">
<span class="t1">总上传SKU数:</span>
<span class="t2">{{ data.all_sku_count }}</span>
</p>
</li>
<li class="boxsiz">
<p class="top row bothSide verCenter">
<span class="t1">商品总数</span>
<em class="t2 row rowCenter verCenter boxsiz"></em>
</p>
<p class="cen row rowCenter">
<span class="t1">型号</span>
<span class="t2 mr">{{ data.weekly_spu_count }}</span>
<span class="t2 mr">{{ data.all_spu_count }}</span>
<span class="t1">品牌</span>
<span class="t2">{{ data.brand_count }}</span>
</p>
<p class="bottom">
<span class="t1">总商品数:</span>
<span class="t2">{{ data.all_spu_count }}</span>
</p>
</li>
<li class="boxsiz">
<p class="top row bothSide verCenter">
......@@ -60,47 +50,34 @@
</li>
</ul>
<ul class="survey-show row avarage boxsiz">
<!-- <li class="boxsiz">
<a class="wrap boxsiz" href="/#/enter">
<i class="iconfont iconjinzhi"></i>
<p class="t1">未通过SKU</p>
</a>
<span class="color1 rowCenter verCenter">{{ data.reject_sku_count }}</span>
</li>-->
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/list">
<a class="wrap boxsiz" href="/#/list?status=3">
<i class="iconfont iconclose"></i>
<p class="t1">下架SKU</p>
</a>
<span class="color2">{{ data.off_shelf_sku_count }}</span>
</li>
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/inquire">
<a class="wrap boxsiz" href="/#/inquire?status=1">
<i class="iconfont iconjinzhi1"></i>
<p class="t1">待报价</p>
</a>
<span class="color3">{{ data.weekly_inquiry_ready_count || 0 }}</span>
<span class="color3">{{ data.inquiry_ready_count || 0 }}</span>
</li>
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/quote">
<a class="wrap boxsiz" href="/#/quote?status=2">
<i class="iconfont iconjinzhi2"></i>
<p class="t1">已选中报价</p>
</a>
<span class="color4">{{ data.weekly_quote_selected_count }}</span>
<span class="color4">{{ data.quote_selected_count }}</span>
</li>
<li class="boxsiz">
<a class="wrap boxsiz" href="/#/quote">
<a class="wrap boxsiz" href="/#/quote?status=3">
<i class="iconfont iconjinzhi2"></i>
<p class="t1">已成单报价</p>
</a>
<span class="color5">{{ data.weekly_quote_deal_count }}</span>
<span class="color5">{{ data.quote_deal_count }}</span>
</li>
<!-- <li class="boxsiz">
<a class="wrap boxsiz">
<i class="iconfont iconjinzhi3 "></i>
<p class="t2">未完待续</p>
</a>
</li>-->
</ul>
<div class="rate-box boxsiz">
<div class="rate-tab row bothSide verCenter">
......@@ -217,7 +194,6 @@ export default {
},
methods: {
change(index, type) {
console.log(index, type)
if (type == 'frqRates') {
this.getFrqRates(this.tabDate);
}
......@@ -305,7 +281,6 @@ export default {
]
};
myChart.setOption(option);
window.onresize = function () {
myChart.resize();
};
......
<template>
<section class="inquire pagex">
<div class="inquire-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="型号">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="型号" prop="goods_name">
<el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="品牌">
<el-form-item label="品牌" prop="brand_name">
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="状态" prop="i_status">
<el-select v-model="formParam.i_status" placeholder="请选择" clearable>
<el-option label="全部" value=""></el-option>
<el-option label="已关闭" value="-1"></el-option>
......@@ -21,6 +21,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -108,6 +109,10 @@ export default {
};
},
created() {
let status = this.$route.query.status;
if (status) {
this.formParam.i_status = status;
}
this.getData();
},
methods: {
......@@ -174,6 +179,10 @@ export default {
}
})
},
resetForm(formName) {
this.formParam.date='';
this.$refs[formName].resetFields();
},
onSubmit() {
this.page = 1;
this.getData();
......
......@@ -674,7 +674,7 @@ export default {
currentChange(val) {
if (val == 1) {
this.ruleForm.tax_rate = '13%';
} else if (val == 2) {
} else{
this.ruleForm.tax_rate = '0%';
}
},
......@@ -742,6 +742,7 @@ export default {
},
//新增报价
added() {
console.log(this.inquiry_info)
this.title = '新增';
this.dialogVisible = true;
this.isModify = false;
......@@ -751,9 +752,13 @@ export default {
this.ruleForm.mpq = '';
this.ruleForm.price_other = '';
this.ruleForm.quote_id = '';
this.ruleForm.quote_number = this.inquiry_info.inquiry_number;
this.ruleForm.batch = this.inquiry_info.batch;
this.ruleForm.expire_time = new Date();
this.ruleForm.goods_name = this.inquiry_info.goods_name; //赋值型号
this.ruleForm.brand_name = this.inquiry_info.brand_name; //赋值品牌
this.ruleForm.delivery_int = this.inquiry_info.delivery_info.delivery_int;
this.ruleForm.delivery_unit_val = this.inquiry_info.delivery_info.delivery_unit_val;
this.$nextTick(() => {
this.$refs['ruleForm'].resetFields();
......
<template>
<section class="quote pagex">
<div class="quote-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="报价型号">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="报价型号" prop="goods_name">
<el-autocomplete clearable v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="品牌">
<el-form-item label="品牌" prop="brand_name">
<el-autocomplete clearable v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="状态" prop="status">
<el-select v-model="formParam.status" placeholder="请选择" clearable>
<el-option label="确认中" value="1"></el-option>
<el-option label="已选中" value="2"></el-option>
......@@ -21,6 +21,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -114,7 +115,7 @@
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tooltip,Tag} from 'element-ui'
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import {NODE_ENVS} from "../../ajax";
import Tool from '../../tool'
......@@ -123,7 +124,7 @@ Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(D
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Tag);
export default {
name: "inquire",
name: "quote",
data() {
return {
total: 0,
......@@ -132,7 +133,7 @@ export default {
tableData: [],
multipleSelection: [],
dialogVisible: false,
logs:[],
logs: [],
formParam: {
goods_name: '',
brand_name: "",
......@@ -142,6 +143,10 @@ export default {
};
},
created() {
let status = this.$route.query.status;
if (status) {
this.formParam.status = status;
}
this.getData();
},
methods: {
......@@ -230,6 +235,10 @@ export default {
}
})
},
resetForm(formName) {
this.formParam.date = '';
this.$refs[formName].resetFields();
},
onSubmit() {
this.page = 1;
this.getData();
......
<template>
<div class="enter pagex">
<div class="enter-con">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="状态">
<el-select v-model="formInline.status" placeholder="全部">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="状态" prop="status">
<el-select v-model="formParam.status" placeholder="全部">
<el-option label="全部" value=""></el-option>
<el-option label="待处理" value="1"></el-option>
<el-option label="处理中" value="2"></el-option>
......@@ -12,10 +12,11 @@
</el-select>
</el-form-item>
<el-form-item label="更新日期">
<el-date-picker v-model="formInline.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker v-model="formParam.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -78,7 +79,7 @@ export default {
uploadUrl: NODE_ENVS + '/api/uploadSku/import',
fileData: {token: Tool.getCookie('token')},
downUrl: NODE_ENVS + '/api/uploadSku/downUploadCsv?token=' + Tool.getCookie('token'),
formInline: {
formParam: {
status: '',
date: ''
},
......@@ -87,9 +88,9 @@ export default {
};
},
watch: {
'formInline.date'(val) {
'formParam.date'(val) {
if (!val) {
this.formInline.date = []
this.formParam.date = []
}
}
},
......@@ -102,9 +103,9 @@ export default {
this.$http('get', "/api/uploadSku/list", {
page: this.page,
limit: this.limit,
status: this.formInline.status,
action_time: this.formInline.date[0],
end_time: this.formInline.date[1]
status: this.formParam.status,
action_time: this.formParam.date[0],
end_time: this.formParam.date[1]
}).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -117,6 +118,10 @@ export default {
}
})
},
resetForm(formName) {
this.formParam.date='';
this.$refs[formName].resetFields();
},
submit() {
this.page = 1;
this.getData();
......
<template>
<section class="store pagex">
<div class="store-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="型号">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="型号" prop="goods_name">
<el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="品牌">
<el-form-item label="品牌" prop="brand_name">
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="状态" prop="join_inquiry">
<el-select v-model="formParam.join_inquiry" placeholder="全部" clearable>
<el-option label="全部" value=""></el-option>
<el-option label="参与询价" value="1"></el-option>
......@@ -17,6 +17,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -844,6 +845,10 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
resetForm(formName) {
this.formParam.date='';
this.$refs[formName].resetFields();
},
onSubmit() {
this.page = 1;
this.getData();
......
<template>
<div class="store pagex">
<div class="store-con">
<el-form :inline="true" :model="formParam" class="demo-form-inline">
<el-form-item label="型号">
<el-form :inline="true" :model="formParam" class="demo-form-inline" ref="formParam">
<el-form-item label="型号" prop="goods_name">
<el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="品牌">
<el-form-item label="品牌" prop="brand_name">
<el-autocomplete v-model="formParam.brand_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsyncBrand" placeholder="请输入品牌" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="状态" prop="status">
<el-select v-model="formParam.status" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option label="上架" value="1"></el-option>
<el-option label="下架" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="更新日期">
<el-form-item label="更新日期" prop="date">
<el-date-picker v-model="formParam.date" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
</el-form-item>
</el-form>
<div class="btn-nav clr">
......@@ -164,7 +165,6 @@
</div>
<Menu/>
</div>
</template>
<script>
import Vue from 'vue';
......@@ -176,7 +176,6 @@ Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(D
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover)
export default {
name: "list",
data() {
return {
total: 0,
......@@ -202,6 +201,10 @@ export default {
};
},
created() {
let status = this.$route.query.status;
if (status) {
this.formParam.status = status;
}
this.getData()
},
methods: {
......@@ -213,8 +216,8 @@ export default {
status: this.formParam.status,
brand_id: this.formParam.brand_id,
brand_name: this.formParam.brand_name,
action_time: this.formParam.date[0],
end_time: this.formParam.date[1]
action_time: this.formParam.date ? this.formParam.date[0] : '',
end_time: this.formParam.date ? this.formParam.date[1] : ''
}).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -321,6 +324,11 @@ export default {
})
},
resetForm(formName) {
this.formParam.date = '';
this.$refs[formName].resetFields();
this.formParam.status='';
},
onSubmit() {
this.page = 1;
this.getData();
......@@ -430,7 +438,6 @@ export default {
}
})
}
},
components: {
Menu
......
......@@ -12,8 +12,13 @@
<span v-else-if="detailInfo.status==4" class="f-red1">其他失败</span>
</div>
</div>
<div class="btn-nav clr">
<el-button type="primary" @click="changeStatus(1)">上架</el-button>
<el-button type="primary" @click="changeStatus(3)">下架</el-button>
</div>
<div class="data-box" v-if="tableData">
<el-table :data="tableData" border max-height="600">
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="40"></el-table-column>
<el-table-column fixed prop="item_id" label="ID" width="75"></el-table-column>
<el-table-column prop="status" fixed label="状态" width="100" align="center">
<template slot-scope="scope">
......@@ -27,6 +32,12 @@
<el-table-column fixed prop="goods_sn" label="供应商内部型号编码" width="180"></el-table-column>
<el-table-column fixed prop="goods_name" label="型号" width="180"></el-table-column>
<el-table-column fixed prop="brand_name" label="品牌" width="180"></el-table-column>
<el-table-column prop="goods_status_name" label="状态" width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.goods_status_name=='上架'" type="success">{{ scope.row.goods_status_name }}</el-tag>
<el-tag v-else-if="scope.row.goods_status_name=='下架'" type="info">{{ scope.row.goods_status_name }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="stock" label="库存数量" width="150"></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>
......@@ -42,7 +53,7 @@
</template>
</template>
</el-table>
<el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
<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>
<Menu/>
</div>
......@@ -64,7 +75,8 @@ export default {
limit: 10,
page: 1,
tableData: "",
maxPrice: []
maxPrice: [],
multipleSelection: []
};
},
watch: {
......@@ -91,6 +103,53 @@ export default {
}
})
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
changeStatus(status) {
var self=this;
var arr = [];
if (this.multipleSelection.length == 0) {
this.$message({
message: '请至少选择一条数据',
type: 'warning'
});
return false;
}
var status_arr = this.multipleSelection.map(obj => {
return obj.status;
})
let flag = status_arr.every(ele => ele === 3)
if (!flag) {
this.$message({
message: '选择审核通过的',
type: 'warning'
});
return false;
}
arr = this.multipleSelection.map(obj => {
return obj.sku_id;
});
this.$http('POST', "/api/sku/updateSkuStatus", {
sku_ids: arr.join(","),
status: status == 1 ? 'passed' : 'offshelf'
}).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
onClose(){
self.getList()
}
});
} else {
this.$message({
message: res.msg,
type: 'error'
});
}
})
},
getList() {
this.$http('get', "/api/uploadSku/itemList", {
page: this.page,
......@@ -119,6 +178,10 @@ export default {
}
})
},
handleSizeChange(val) {
this.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.page = val;
this.getList();
......@@ -131,4 +194,9 @@ export default {
</script>
<style scoped>
@import "../../assets/css/store/listDetail.min.css";
.btn-nav {
background: #FFFFFF;
padding: 0 0 20px 20px;
}
</style>
\ No newline at end of file
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