Skip to content

J
jiedao-app-operator-master
Commit a42c4dd8 authored by dcy's avatar dcy
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 635a1fd3 440f4248
Show whitespace changes
Inline Side-by-side
Showing with 623 additions and 422 deletions
src/api/ecw/channel.js
View file @ a42c4dd8
......@@ -21,7 +21,7 @@ export function updateChannel(data) {
// 删除渠道管理
export function deleteChannel(id) {
return request({
url: '/ecw/channel/delete?id=' + id,
url: '/ecw/channel/delete?channelId=' + id,
method: 'delete'
})
}
......
src/api/ecw/coupon.js
View file @ a42c4dd8
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 创建优惠券信息
export function createCoupon(data) {
return request({
url: '/ecw/coupon/createOrUpdate',
url: '/product/coupon/createOrUpdate',
method: 'post',
data: data
})
......@@ -12,7 +12,7 @@ export function createCoupon(data) {
// 更新优惠券信息
export function updateCoupon(data) {
return request({
url: '/ecw/coupon/update',
url: '/product/coupon/update',
method: 'put',
data: data
})
......@@ -21,7 +21,7 @@ export function updateCoupon(data) {
// 删除优惠券信息
export function deleteCoupon(id) {
return request({
url: '/ecw/coupon/delete?id=' + id,
url: '/product/coupon/delete?id=' + id,
method: 'delete'
})
}
......@@ -29,7 +29,7 @@ export function deleteCoupon(id) {
// 获得优惠券信息
export function getCoupon(id) {
return request({
url: '/ecw/coupon/get?couponId=' + id,
url: '/product/coupon/get?couponId=' + id,
method: 'get'
})
}
......@@ -37,7 +37,7 @@ export function getCoupon(id) {
// 获得优惠券信息分页
export function getCouponPage(query) {
return request({
url: '/ecw/coupon/page',
url: '/product/coupon/page',
method: 'get',
params: query
})
......@@ -46,7 +46,7 @@ export function getCouponPage(query) {
// 获得优惠券下拉
export function getCouponSelect(query) {
return request({
url: '/ecw/coupon/select',
url: '/product/coupon/select',
method: 'get',
params: query
})
......@@ -55,7 +55,7 @@ export function getCouponSelect(query) {
// 导出优惠券信息 Excel
export function exportCouponExcel(query) {
return request({
url: '/ecw/coupon/export-excel',
url: '/product/coupon/export-excel',
method: 'get',
params: query,
responseType: 'blob'
......
src/api/ecw/zhongPao.js
View file @ a42c4dd8
......@@ -18,6 +18,14 @@ export function updateZhongPao(data) {
})
}
// 删除重泡货配置
export function deleteZhongPao(id) {
return request({
url: '/ecw/zhong-pao/delete?id=' + id,
method: 'delete'
})
}
// 获得重泡货配置
export function getZhongPao(id) {
return request({
......
src/components/ProductsSelector/index.vue
View file @ a42c4dd8
......@@ -36,92 +36,113 @@
</el-row>
</template>
<script>
import {getProductPage} from '@/api/ecw/product'
import {getProductTypeList} from '@/api/ecw/productType'
import {getProductAttrList} from '@/api/ecw/productAttr'
import { getProductPage } from '@/api/ecw/product'
import { getProductTypeList } from '@/api/ecw/productType'
import { getProductAttrList } from '@/api/ecw/productAttr'
export default {
data(){
props: {
defaultIds: {
type: Array,
default: []
}
},
data() {
return {
list:[],
list: [],
page: 1,
pages: 1,
queryParams:{
queryParams: {
page: 1,
attrId: null,
titleZh: null,
typeId: null
},
choosedList:[],
typeList:[],
attrList:[]
choosedList: [],
typeList: [],
attrList: []
}
},
computed:{
ids(){
computed: {
ids: {
get() {
let arr = []
this.choosedList.forEach(item => {
arr.push(item.id)
})
return arr
},
set(v) {
}
}
},
watch:{
ids(val){
watch: {
ids(val) {
this.$emit('input', val)
}
},
created(){
created() {
getProductTypeList().then(res => this.typeList = res.data)
getProductAttrList().then(res => this.attrList = res.data)
this.reLoad()
this.ids = this.defaultIds //数据回显
},
methods:{
reLoad(){
methods: {
reLoad() {
this.queryParams.page = 1
this.list = []
this.getList()
},
loadNextPage(){
if(this.page >= this.pages){
loadNextPage() {
if (this.page >= this.pages) {
return this.$message.error('已加载全部')
}
this.queryParams.page ++
this.queryParams.page++
this.getList()
},
getList(){
getList() {
getProductPage(this.queryParams).then(res => {
this.list = res.data.list //.concat(res.data.list || [])
this.page = res.data.page
this.pages = res.data.pages
this.choosedList = [] //搜搜重置，数据回显
if (this.defaultIds.length > 0) {
this.defaultIds.map(item => {
this.list.map(items => {
if (items.id == item) {
this.choosedList.push(items)
}
})
})
}
})
},
toggleCheck(item, checked){
if(checked){
toggleCheck(item, checked) {
if (checked) {
this.choose(item)
}else{
} else {
this.remove(item)
}
},
choose(item){
choose(item) {
this.choosedList.push(item)
},
remove(item){
this.choosedList.forEach((choosed,index) => {
if(choosed.id==item.id) this.choosedList.splice(index,1)
remove(item) {
this.choosedList.forEach((choosed, index) => {
if (choosed.id == item.id) this.choosedList.splice(index, 1)
})
}
}
}
</script>
<style scoped lang="scss">
.header{
>div{
.header {
> div {
margin-right: 5px;
}
}
.list{
.list {
height: 200px;
border: 1px solid #ccc;
overflow-y: auto;
......@@ -130,7 +151,7 @@ export default {
display: flex;
flex-wrap: wrap;
.item{
.item {
width: 50%;
line-height: 20px;
height: 50px;
......
src/utils/dict.js
View file @ a42c4dd8
......@@ -97,6 +97,8 @@ export const DICT_TYPE = {
ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
PWD_TYPE: 'pwd_type',
ZHONG_PAO_TYPE: 'zhong_pao_type',
TRANSPORT_TYPE: 'transport_type',
BRAND_REG_TYPE: 'brand_registry_type',
BRAND_AUTH_STATUS: 'brand_authorization_status',
BRAND_CUSTOMER_CHARGING_MODEL: 'customer_charging_model',
......
src/views/ecw/channel/index.vue
View file @ a42c4dd8
......@@ -73,11 +73,23 @@
<el-table-column label="名称" align="center" prop="nameZh" />
<!-- <el-table-column label="名称-英文" align="center" prop="nameEn" /> -->
<el-table-column label="内部名称" align="center" prop="internalNameZh" />
<!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" /> -->
<!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
<el-table-column label="类型编码" align="center" prop="typeNumber" />
<el-table-column label="仓库ID字符串" align="center" prop="warehouseIds" />
<!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
<el-table-column label="仓库名" align="center" prop="warehouseNameList" width="180">
<template slot-scope="scope">
<el-scrollbar style="margin-right: 6px;">
<div class="left">
<el-tag v-for="warehouseName in scope.row.warehouseNameList"
:key="warehouseName.index">
<span>{{warehouseName}}</span>
</el-tag>
</div>
</el-scrollbar>
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="快递ID" align="center" prop="expressId" />
<el-table-column label="快递公司" align="center" prop="companyName" />
<el-table-column label="预计时间(天)" align="center" prop="etaTime" />
<el-table-column label="渠道代理" align="center" prop="channelAgent" />
<el-table-column label="备注" align="center" prop="remarksZh" />
......@@ -262,3 +274,26 @@ export default {
}
};
</script>
<style lang="scss">
.left {
.el-tag {
background-color: #e6f6fd;
border: 1px solid #ccecfb;
display: inline-block;
height:auto;
padding: 0 10px;
line-height: 30px;
font-size: 12px;
color: #02a1e9;
border-radius: 4px;
box-sizing: border-box;
white-space: nowrap;
}
}
</style>
src/views/ecw/currency/index.vue
View file @ a42c4dd8
......@@ -47,7 +47,7 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
100外币兑人民币（CNY）汇率表
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
......
src/views/ecw/product/index.vue
View file @ a42c4dd8
......@@ -4,38 +4,38 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商品编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入商品编码" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.productCode" placeholder="请输入商品编码" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="海关编码" prop="customsCode">
<el-input v-model="queryParams.customsCode" placeholder="请输入海关编码" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.customsCode" placeholder="请输入海关编码" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="商品名称" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.titleZh" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="商品类型" prop="typeId">
<el-select v-model="queryParams.typeId" placeholder="选择商品类型" clearable>
<el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id"/>
<el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id" />
</el-select>
</el-form-item>
<el-form-item label="商品特性" prop="attrId">
<el-select v-model="queryParams.attrId" placeholder="选择商品特性" clearable>
<el-option v-for="attr in attrList" :key="attr.id" :label="attr.attrName" :value="attr.id"/>
<el-option v-for="attr in attrList" :key="attr.id" :label="attr.attrName" :value="attr.id" />
</el-select>
</el-form-item>
<el-form-item label="审核状态" prop="auditStatus">
<el-select v-model="queryParams.auditStatus" placeholder="选择审核状态" clearable>
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="auditStatusItem.value"/>
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="auditStatusItem.value" />
</el-select>
</el-form-item>
<el-form-item label="上架状态" prop="status">
<el-select v-model="queryParams.status" placeholder="选择上架状态" clearable>
<el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE ? '已上架' : '已下架'" :value="statusItem.value"/>
<el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE ? '已上架' : '已下架'" :value="statusItem.value" />
</el-select>
</el-form-item>
......@@ -48,15 +48,19 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:product:create']">新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ecw:product:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="multiple" v-hasPermi="['ecw:product:attr']">批量设置商品属性</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center">
</el-table-column>
<el-table-column label="商品编号" align="center" prop="id" />
<el-table-column label="商品类型" align="center" prop="typeId">
<template slot-scope="scope">
......@@ -75,7 +79,7 @@
<el-table-column prop="auditStatus" align="center" label="是否审核" width="120">
<template slot-scope="scope">
<el-select v-model="scope.row.auditStatus" @change="handleStatusChange(scope.row, 'auditStatus')">
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="parseInt(auditStatusItem.value)"/>
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="parseInt(auditStatusItem.value)" />
</el-select>
</template>
</el-table-column>
......@@ -83,35 +87,30 @@
<el-table-column prop="status" align="center" label="状态" width="120">
<template slot-scope="scope">
<el-select v-model="scope.row.status" @change="handleStatusChange(scope.row, 'status')">
<el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE + '' ? '已上架' : '已下架'" :value="parseInt(statusItem.value)"/>
<el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE + '' ? '已上架' : '已下架'" :value="parseInt(statusItem.value)" />
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="toPriceManager(scope.row)"
v-hasPermi="['ecw:product-price:query']">路线价格</el-button>
<el-button size="mini" type="text" @click="toPriceManager(scope.row)" v-hasPermi="['ecw:product-price:query']">路线价格</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:product:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:product:delete']">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ecw:product:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ecw:product:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="商品类型" prop="typeId">
<el-select v-model="form.typeId" placeholder="选择商品类型" clearable>
<el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id"/>
<el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id" />
</el-select>
</el-form-item>
......@@ -125,7 +124,7 @@
<el-form-item label="商品图片" prop="img">
<el-col :span="8">
<el-input v-model="form.imgs" placeholder="请上传图片" disabled/>
<el-input v-model="form.imgs" placeholder="请上传图片" disabled />
</el-col>
<el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
......@@ -147,30 +146,29 @@
<el-form-item label="商品特性" prop="attrArray">
<el-select v-model="form.attrArray" placeholder="选择商品特性" clearable multiple>
<el-option v-for="attr in attrList" :key="attr.id" :label="attr.attrName" :value="attr.id"/>
<el-option v-for="attr in attrList" :key="attr.id" :label="attr.attrName" :value="attr.id" />
</el-select>
</el-form-item>
<el-form-item label="商品材质" prop="materialType">
<el-select v-model="form.materialType" placeholder="选择商品材质" clearable>
<el-option v-for="materialItem in materialList" :key="materialItem.value" :label="materialItem.label" :value="materialItem.value"/>
<el-option v-for="materialItem in materialList" :key="materialItem.value" :label="materialItem.label" :value="materialItem.value" />
</el-select>
</el-form-item>
<el-form-item label="出运要求" prop="requirements">
<el-checkbox v-model="form.requirements" :checked="form.requirements===1? true:false"
:true-label="1" :false-label="0">证书要求（支持多证书）</el-checkbox>
<el-checkbox v-model="form.requirements" :checked="form.requirements===1? true:false" :true-label="1" :false-label="0">证书要求（支持多证书）</el-checkbox>
</el-form-item>
<el-form-item label="包装要求" prop="packaging">
<el-select v-model="form.packaging" placeholder="选择包装要求" clearable>
<el-option v-for="packageItem in packagingList" :key="packageItem.value" :label="packageItem.label" :value="packageItem.value"/>
<el-option v-for="packageItem in packagingList" :key="packageItem.value" :label="packageItem.label" :value="packageItem.value" />
</el-select>
</el-form-item>
<el-form-item label="默认货柜位置" prop="containerLocation">
<el-select v-model="form.containerLocation" placeholder="选择货柜位置" clearable>
<el-option v-for="locationItem in locationList" :key="locationItem.value" :label="locationItem.label" :value="locationItem.value"/>
<el-option v-for="locationItem in locationList" :key="locationItem.value" :label="locationItem.label" :value="locationItem.value" />
</el-select>
</el-form-item>
......@@ -214,16 +212,22 @@ export default {
},
data() {
return {
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
//特性列表
attrList:[],
attrList: [],
//类型列表
typeList:[],
typeList: [],
//材质列表
materialList:[],
materialList: [],
//包装列表
packagingList:[],
packagingList: [],
//货柜位置
locationList:[],
locationList: [],
// 遮罩层
loading: true,
......@@ -259,11 +263,11 @@ export default {
attrArray: [{ required: true, message: "商品特性不能为空", trigger: "change" }],
titleZh: [{ required: true, message: "中文标题不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文标题不能为空", trigger: "blur" }],
materialType:[{ required: true, message: "商品材质不能为空", trigger: "blur" }],
packaging:[{ required: true, message: "包装要求不能为空", trigger: "blur" }],
containerLocation:[{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
square:[{ required: true, message: "默认方数不能为空", trigger: "blur" }],
needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
materialType: [{ required: true, message: "商品材质不能为空", trigger: "blur" }],
packaging: [{ required: true, message: "包装要求不能为空", trigger: "blur" }],
containerLocation: [{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
square: [{ required: true, message: "默认方数不能为空", trigger: "blur" }],
needBook: [{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
},
CommonStatusEnum: CommonStatusEnum,
......@@ -279,9 +283,9 @@ export default {
computed: {
getTypeName() {
return typeId => {
for(let index in this.typeList) {
for (let index in this.typeList) {
let typeItem = this.typeList[index];
if(typeItem.id == typeId) {
if (typeItem.id == typeId) {
return typeItem.titleZh;
}
}
......@@ -292,11 +296,11 @@ export default {
return attrIds => {
let productAttrArray = [];
let attrArray = attrIds.split(',');
for(let attrIndex in attrArray) {
for (let attrIndex in attrArray) {
let attrId = attrArray[attrIndex];
for(let index in this.attrList) {
for (let index in this.attrList) {
let attrItem = this.attrList[index];
if(attrItem.id == attrId) {
if (attrItem.id == attrId) {
productAttrArray.push(attrItem.attrName);
}
}
......@@ -309,7 +313,7 @@ export default {
created() {
let typeId = this.$route.query.typeId;
if(typeId) {
if (typeId) {
this.queryParams.typeId = parseInt(typeId);
}
this.getAttrList();
......@@ -336,7 +340,7 @@ export default {
/* localStorage.setItem('product', JSON.stringify(row));
localStorage.setItem('typeList', JSON.stringify(this.typeList)); */
this.$router.push({
name:'ProductPrice',
name: 'ProductPrice',
query: {
product_id: row.id,
product_type: row.typeId
......@@ -347,8 +351,8 @@ export default {
handleStatusChange(row, statusType) {
updateProduct(row).then(() => {
this.$modal.msgSuccess("修改成功");
}).catch(function() {
if(statusType == 'status') {
}).catch(function () {
if (statusType == 'status') {
row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE : CommonStatusEnum.ENABLE;
} else {
row.auditStatus = row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
......@@ -361,7 +365,7 @@ export default {
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
let params = { ...this.queryParams };
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getProductPage(params).then(response => {
......@@ -386,7 +390,7 @@ export default {
titleEn: undefined,
auditStatus: undefined,
status: undefined,
requirements:0,
requirements: 0,
};
this.resetForm("form");
},
......@@ -406,7 +410,7 @@ export default {
this.reset();
this.open = true;
this.title = "添加商品";
if(this.queryParams.typeId) {
if (this.queryParams.typeId) {
this.form.typeId = this.queryParams.typeId;
}
},
......@@ -417,7 +421,7 @@ export default {
getProduct(id).then(response => {
this.form = response.data;
let attrArray = this.form.attrId.split(',');
for(let index in attrArray) {
for (let index in attrArray) {
let value = attrArray[index];
attrArray[index] = parseInt(value);
}
......@@ -457,17 +461,17 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除商品编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除商品编号为"' + id + '"的数据项?').then(function () {
return deleteProduct(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
......@@ -478,7 +482,7 @@ export default {
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}).catch(() => { });
},
// 覆盖默认的上传行为
......@@ -513,6 +517,22 @@ export default {
var uuid = s.join("");
return uuid;
},
// 表格多选
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
// 批量设置商品属性
handleEdit() {
this.$router.push({
path: "product-attr/edit",
query: {
ids: this.ids
}
});
}
}
};
</script>
src/views/ecw/productAttr/edit.vue
View file @ a42c4dd8
......@@ -2,8 +2,8 @@
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="适用商品" prop="idList" v-if="form.type != 1">
<products-selector v-model="form.idList" />
<el-form-item label="适用商品" prop="idList">
<products-selector :defaultIds="form.idList" v-model="form.idList" />
</el-form-item>
<el-form-item label="货柜位置" prop="containerLocation">
......@@ -36,10 +36,10 @@
<el-checkbox style="width: 100px" v-model="checked[6]">需要修改</el-checkbox>
<dict-selector v-if="checked[6]" form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.attrId" multiple />
</el-form-item>
<!-- <el-form-item label="商品材质" prop="">
<el-form-item label="商品材质" prop="materialType">
<el-checkbox style="width: 100px" v-model="checked[7]">需要修改</el-checkbox>
<dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.status" multiple />
</el-form-item> -->
<dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.materialType" multiple />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -75,11 +75,12 @@ export default {
"needBook": undefined,
"packaging": undefined,
"requirements": undefined,
"square": undefined
"square": undefined,
"materialType": undefined
},
// 表单校验
rules: {},
checked: [false, false, false, false, false, false, false]
checked: [false, false, false, false, false, false, false, false]
};
},
computed: {
......@@ -88,7 +89,7 @@ export default {
watch: {
'form.idList'(val) {
if (val.length > 0) {
this.form.isAllProduct = undefined
this.form.isAllProduct = 0
} else {
this.form.isAllProduct = 1
}
......@@ -96,6 +97,7 @@ export default {
},
created() {
this.reset()
this.form.idList = this.$route.query && this.$route.query.ids ? [...this.$route.query.ids].map(item => { return Number(item) }) : []
},
methods: {
/** 表单重置 */
......@@ -109,7 +111,8 @@ export default {
"needBook": undefined,
"packaging": undefined,
"requirements": undefined,
"square": undefined
"square": undefined,
"materialType": undefined
};
this.resetForm("form");
},
......@@ -130,17 +133,3 @@ export default {
},
};
</script>
\ No newline at end of file
<style scoped lang="scss">
.fee-item {
padding: 5px 0;
> div {
margin-right: 5px;
}
}
.coupon-list {
max-height: 200px;
border: 1px solid #ccc;
padding: 10px;
overflow-y: auto;
}
</style>
\ No newline at end of file
src/views/ecw/zhongPao/index.vue
View file @ a42c4dd8
<template>
<div class="app-container">
<!-- (添加 / 修改) -->
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="泡货配置" prop="paoLinjie">
临界值：每CBM小于
<el-input v-model="form.paoLinjie" placeholder="请输入泡货临界值" style="width: 100px; "/>
Kg属于泡货
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
<el-form-item label="重泡货类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择重泡货类型" clearable size="small">
<el-option v-for="dict in getDictDatas(DICT_TYPE.ZHONG_PAO_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="始发地ID" prop="departureId">-->
<!-- <el-input v-model="queryParams.departureId" placeholder="请输入始发地ID" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="目的地ID列表" prop="objectiveIds">-->
<!-- <el-input v-model="queryParams.objectiveIds" placeholder="请输入目的地ID列表" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<el-form-item label="创建时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="计算公式" prop="paoGs">
泡货重量（Kg）= 实际体积（CBM）X
<el-input v-model="form.paoGs" placeholder="请输入泡货公式" style="width: 100px; "/>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item label="货运方式" prop="paoYsIds">
<el-checkbox-group v-model="form.paoYsIdList">
<el-checkbox v-for="dict in transportDatas" :label="dict.value" :key="dict.value" :value="dict.value"
name="paoYsIds"> {{dict.label}}
</el-checkbox>
</el-checkbox-group>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:zhong-pao:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:zhong-pao:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="序号" type="index" width="50px" />
<el-table-column label="重泡货类型" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ZHONG_PAO_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="传输方式" align="center" prop="transportTypes">
<template slot-scope="scope">
<span v-for="item in scope.row.transportTypes.split(',')"><dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="item" />, </span>
</template>
</el-table-column>
<el-table-column label="始发地" align="center" prop="departureId" :formatter="departureFormatter"/>
<el-table-column label="目的地" align="center" prop="objectiveIds" :formatter="objectiveFormatter"/>
<el-table-column label="临介值标准" align="center" prop="edge" />
<el-table-column label="计算公式" align="center" prop="formulas" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="transportTypes">
<template v-slot="scope">
<el-switch v-model="scope.row.status" @change="handleStatusChange(scope.row)" :active-value="0" :inactive-value="1"></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:zhong-pao:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:zhong-pao:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="540px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="重泡货类型" prop="type">
<el-select v-model="form.type" placeholder="请选择重泡货类型" @change="form.transportTypes = ''">
<el-option v-for="dict in getDictDatas(DICT_TYPE.ZHONG_PAO_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="泡货是否开启" prop="paoIsOpen">
<el-radio-group v-model="form.paoIsOpen">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}
</el-radio>
</el-radio-group>
<el-form-item label="传输方式" prop="transportTypes">
<dict-selector :type="DICT_TYPE.TRANSPORT_TYPE" v-model="form.transportTypes" multiple form-type="checkbox" :filter="transportTypesFilter"></dict-selector>
</el-form-item>
<el-divider></el-divider>
<el-form-item label="重货配置" prop="zhongLinjie">
临界值：每CBM大于
<el-input v-model="form.zhongLinjie" placeholder="请输入重货临界值" style="width: 100px; "/>
Kg属于重货
<el-form-item label="始发地" prop="departureId">
<el-select v-model="form.departureId" placeholder="请选择始发地">
<el-option label="全部" :value="0"></el-option>
<el-option v-for="(item) in warehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计算公式" prop="zhongGs">
重货体积（CBM） = 实际重量（Kg）X
<el-input v-model="form.zhongGs" placeholder="请输入重货公式" style="width: 100px; "/>
<el-form-item label="目的地" prop="objectiveIds">
<!-- <el-input v-model="form.objectiveIds" placeholder="请输入目的地ID列表" />-->
<el-select v-model="form.objectiveIds" placeholder="请选择目的地" multiple>
<el-option label="全部" value="0"></el-option>
<el-option v-for="(item) in importCityList" :label="item.titleZh" :value="item.id.toString()" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="货运方式" prop="zhongYsIds">
<el-checkbox-group v-model="form.zhongYsIdList">
<el-checkbox v-for="dict in transportDatas" :label="dict.value" :key="dict.value" :value="dict.value"
name="zhongYsIds"> {{dict.label}}
</el-checkbox>
</el-checkbox-group>
<el-form-item :label="`${form.type !== 1 ? '泡' : '重'}货临介值`" prop="edge">
<el-input v-model="form.edge" placeholder="请输入临介值">
<template slot="prepend">每CBM{{form.type !== 1 ? '小' : '大'}}于</template>
<template slot="append">kg属于{{form.type !== 1 ? '泡' : '重'}}货</template>
</el-input>
</el-form-item>
<el-form-item label="重货是否开启" prop="zhongIsOpen">
<el-radio-group v-model="form.zhongIsOpen">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}
</el-radio>
</el-radio-group>
<el-form-item label="公式" prop="formulas">
<el-input v-model="form.formulas" placeholder="请输入公式">
<template slot="prepend">{{form.type !== 1 ? '泡货重量(kg)=实际体积（CBM）*' : '重货体积(CBM)=实际重量（KG）*'}} </template>
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">保存配置</el-button>
<el-button @click="cancel">重 置</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
createZhongPao,
updateZhongPao,
deleteZhongPao,
getZhongPao,
getZhongPaoPage,
exportZhongPaoExcel
} from "@/api/ecw/zhongPao";
import {getDictDatas, DICT_TYPE} from '@/utils/dict';
import { createZhongPao, updateZhongPao, deleteZhongPao, getZhongPao, getZhongPaoPage, exportZhongPaoExcel } from "@/api/ecw/zhongPao";
import {DICT_TYPE, getDictDatas} from "@/utils/dict"
import {parseTime} from "@/utils/ruoyi"
import DictSelector from "@/components/DictSelector"
import {getTradeCityList} from "@/api/ecw/region"
import {getWarehouseList} from "@/api/ecw/warehouse"
import { CommonStatusEnum } from '@/utils/constants'
export default {
export default {
name: "ZhongPao",
components: {},
components: {
DictSelector
},
data() {
return {
DICT_TYPE,
getDictDatas,
parseTime,
// 遮罩层
loading: true,
// 导出遮罩层
......@@ -93,32 +160,56 @@
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10
pageSize: 10,
type: null,
departureId: null,
objectiveIds: null,
},
// 表单参数
form: {
paoYsIdList: [],
zhongYsIdList: [],
},
form: {},
// 表单校验
rules: {
paoIsOpen: [{required: true, message: "泡货是否开启不能为空", trigger: "blur"}],
zhongIsOpen: [{required: true, message: "重货是否开启不能为空", trigger: "blur"}],
paoYsIdList: [
{type: 'array', required: true, message: '泡货请至少选择一个货运方式', trigger: 'change'}
],
zhongYsIdList: [
{type: 'array', required: true, message: '重货请至少选择一个货运方式', trigger: 'change'}
],
},
transportDatas: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)
importCityList: [],
warehouseList: []
};
},
created() {
this.getList();
getTradeCityList({type: 1}).then(r => {
this.importCityList = r.data.filter(item => item.type === '1')
})
getWarehouseList().then(r => {
this.warehouseList = r.data
})
},
methods: {
handleStatusChange(row){
let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
this.$modal.confirm('确认要' + text + '吗?').then(function() {
return updateZhongPao({
id: row.id,
status: row.status
})
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
: CommonStatusEnum.ENABLE;
});
},
departureFormatter(row, column, cellValue) {
if (cellValue === 0) return '全部'
return this.warehouseList.find(e => e.id === cellValue)?.titleZh
},
objectiveFormatter(row, column, cellValue) {
if (!cellValue || cellValue.length === 0) return ''
if (cellValue === '0') return '全部'
return cellValue.split(',').map(id => this.importCityList.find(e => e.id === parseInt(id))?.titleZh).join(', ')
},
transportTypesFilter({value}) {
return (this.form.type === 1 && (value === '1' || value === '2')) || (this.form.type === 2 && (value === '3' || value === '4'))
},
/** 查询列表 */
getList() {
this.loading = true;
......@@ -127,75 +218,110 @@
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getZhongPaoPage(params).then(response => {
let list = response.data.list;
if (list && list.length > 0) {
this.form = list[0];
if (this.form.zhongYsIds) {
let ckList = this.form.zhongYsIds.split(',');
this.$set(this.form, 'zhongYsIdList', ckList);
}
if (this.form.paoYsIds) {
let ckList = this.form.paoYsIds.split(',');
this.$set(this.form, 'paoYsIdList', ckList);
}
} else {
this.form = {
id: undefined,
paoLinjie: undefined,
paoGs: undefined,
paoYsIds: undefined,
paoYsIdList: [],
paoIsOpen: undefined,
zhongLinjie: undefined,
zhongGs: undefined,
zhongYsIds: undefined,
zhongYsIdList: [],
zhongIsOpen: undefined
};
}
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
type: undefined,
edge: undefined,
formulas: undefined,
transportTypes: '',
departureId: undefined,
objectiveIds: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加重泡货配置";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getZhongPao(id).then(response => {
const form = response.data;
form.objectiveIds = form.objectiveIds && form.objectiveIds.length > 0 ? form.objectiveIds.split(',') : []
this.form = form
this.open = true;
this.title = "修改重泡货配置";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
this.form.paoYsIds = this.form.paoYsIdList.join(",");
this.form.zhongYsIds = this.form.zhongYsIdList.join(",");
this.form.zhongYsIdList = [];
this.form.paoYsIdList = [];
let form = this.form
form.objectiveIds = form.objectiveIds?.join(',')
// 修改的提交
if (this.form.id != null) {
updateZhongPao(this.form).then(response => {
this.$modal.msgSuccess("保存配置成功");
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
// 添加的提交
createZhongPao(this.form).then(response => {
this.$modal.msgSuccess("保存配置成功");
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除重泡货配置编号为"' + id + '"的数据项?').then(function() {
return deleteZhongPao(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有重泡货配置数据项?').then(() => {
this.exportLoading = true;
return exportZhongPaoExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
};
</script>
src/views/system/helpDoc/index.vue
View file @ a42c4dd8
......@@ -82,7 +82,7 @@
<editor v-model="form.contentZh" :min-height="192"/>
</el-form-item>
<el-form-item label="内容英语" prop="contentEn">
<editor v-model="form.contentZh" :min-height="192"/>
<editor v-model="form.contentEn" :min-height="192"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
......
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 to comment