Skip to content

J
jiedao-app-operator-master
Commit f0308b78 authored by wanglianghe's avatar wanglianghe
Browse files
Options

出货渠道，特殊需求，黑名单

parent 6142d2f7
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 152 deletions
src/views/ecw/product/index.vue
View file @ f0308b78
......@@ -190,33 +190,6 @@
<template slot="append">立方米</template>
</el-input>
</el-form-item>
<el-form-item label="默认重货标准" prop="zhongLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.zhongLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="zhongLinjieFlag" @change="zhongpaoChange('zhong')"></el-switch>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="默认泡货标准" prop="paoLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.paoLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="paoLinjieFlag" @change="zhongpaoChange('pao')"></el-switch>
</el-col>
</el-row>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -233,7 +206,6 @@ import { getProductAttrList } from "@/api/ecw/productAttr";
import { getProductTypeList } from "@/api/ecw/productType";
import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import { CommonStatusEnum, AuditStatusEnum } from '@/utils/constants';
import { getZhongPaoPage } from "@/api/ecw/zhongPao";
import { uploadFile } from "@/api/infra/file";
export default {
......@@ -252,12 +224,6 @@ export default {
packagingList:[],
//货柜位置
locationList:[],
//重货默认开启状态
zhongLinjieFlag: true,
//泡货默认开启状态
paoLinjieFlag: true,
//重泡货默认配置
zhongPaoInfo: {},
// 遮罩层
loading: true,
......@@ -297,8 +263,6 @@ export default {
packaging:[{ required: true, message: "包装要求不能为空", trigger: "blur" }],
containerLocation:[{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
square:[{ required: true, message: "默认方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
// paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
},
......@@ -351,27 +315,8 @@ export default {
this.getAttrList();
this.getTypeList();
this.getList();
this.getZhongPaoInfo();
},
methods: {
/**获取重泡货默认配置 */
getZhongPaoInfo() {
getZhongPaoPage({}).then(response => {
let list = response.data.list;
if (list && list.length > 0) {
this.zhongPaoInfo = list[0];
}
})
},
zhongpaoChange(type) {
if(type == 'zhong') {
this.setZhongValue();
} else if(type == 'pao') {
this.setPaoValue();
}
},
/** 获取产品属性列表 */
getAttrList() {
getProductAttrList().then(response => {
......@@ -460,8 +405,6 @@ export default {
if(this.queryParams.typeId) {
this.form.typeId = this.queryParams.typeId;
}
this.setZhongValue();
this.setPaoValue();
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -477,34 +420,9 @@ export default {
this.form.attrArray = attrArray;
this.open = true;
this.title = "修改商品";
if(!this.form.zhongLinjie) {
this.setZhongValue();
}
if(!this.form.paoLinjie) {
this.setPaoValue();
}
});
},
setZhongValue() {
if(this.zhongLinjieFlag && this.zhongPaoInfo.zhongLinjie) {
this.form.zhongLinjie = parseFloat(this.zhongPaoInfo.zhongLinjie);
} else {
// this.form.zhongLinjie = null;
}
},
setPaoValue() {
if(this.paoLinjieFlag && this.zhongPaoInfo.paoLinjie) {
this.form.paoLinjie = parseFloat(this.zhongPaoInfo.paoLinjie);
} else {
// this.form.paoLinjie = null;
}
},
/** 提交按钮 */
submitForm() {
console.log(this.form);
......
src/views/ecw/productPrice/index.vue
View file @ f0308b78
......@@ -3,11 +3,35 @@
<!-- 搜索工作栏 -->
<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-form-item>
<el-form-item label="海关编码" prop="customsCode">
<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-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-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-select>
</el-form-item>
<el-form-item label="始发地" prop="startCityId">
<el-select v-model="queryParams.startCityId" clearable>
<el-option v-for="city in startCityList" :key="city.id" :label="city.titleZh" :value="city.id" />
</el-select>
</el-form-item>
</el-select>
</el-form-item>
<el-form-item label="目的地" prop="destCityId">
<el-select v-model="queryParams.destCityId" clearable>
......@@ -20,6 +44,13 @@
<el-option v-for="dict in transportDatas" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="" prop="blacklist">
<el-checkbox v-model="queryParams.blacklist"
:true-label="1" :false-label="0">黑名单</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
......@@ -44,6 +75,36 @@
<el-table v-loading="loading" :data="list">
<el-table-column label="序号" type="index" width="50" />
<el-table-column label="商品编码" align="center" prop="productCode" >
<template slot-scope="scope">
<div>
{{ scope.row.productDO.productCode }}
</div>
</template>
</el-table-column>
<el-table-column label="海关编码" align="center" prop="customsCode" >
<template slot-scope="scope">
<div>
{{ scope.row.productDO.customsCode }}
</div>
</template>
</el-table-column>
<el-table-column label="商品类型" align="center" prop="typeId">
<template slot-scope="scope">
<span>{{ getTypeName(scope.row.productDO.typeId) }}</span>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" prop="productName" >
<template slot-scope="scope">
<div>
{{ scope.row.productDO.titleZh }}
</div>
</template>
</el-table-column>
<el-table-column prop="tansportType" label="运输方式" align="center" width="100">
<template slot-scope="scope">
<div>
......@@ -74,11 +135,11 @@
</template>
</el-table-column>
<el-table-column prop="auditStatus" align="center" label="是否审核" width="120">
<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)">
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="parseInt(auditStatusItem.value)"/>
</el-select>
<div>
{{ statusName(scope.row) }}
</div>
</template>
</el-table-column>
......@@ -94,6 +155,11 @@
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:product-price:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="updateStatus(scope.row, 'blacklist')"
v-hasPermi="['ecw:product-price:update']">{{ scope.row.blacklist == 0 ? '加入黑名单' : '移除黑名单' }}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="updateStatus(scope.row, 'auditStatus')"
v-hasPermi="['ecw:product-price:update']">{{scope.row.auditStatus == AuditStatusEnum.PASS ? '下架' : '上架'}}</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:product-price:delete']">删除</el-button> -->
</template>
......@@ -246,32 +312,6 @@
</el-input>
</el-form-item>
<el-form-item label="重货标准" prop="zhongLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.zhongLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="zhongLinjieFlag" @change="zhongpaoChange('zhong')"></el-switch>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="泡货标准" prop="paoLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.paoLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="paoLinjieFlag" @change="zhongpaoChange('pao')"></el-switch>
</el-col>
</el-row>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -287,7 +327,8 @@ import { createProductPrice, updateProductPrice, deleteProductPrice, getProductP
import { openedRouterList } from "@/api/ecw/warehouse";
import { getCityList } from "@/api/ecw/region";
import { getProductTypeList } from "@/api/ecw/productType";
import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import { getProductAttrList } from "@/api/ecw/productAttr";
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import { getCurrencyList } from '@/api/ecw/currency';
import { getUnitList } from '@/api/ecw/unit';
import { AuditStatusEnum} from '@/utils/constants'
......@@ -298,6 +339,8 @@ export default {
},
data() {
return {
//特性列表
attrList:[],
typeList: [],
product: null,
startCityList: [], //始发地城市
......@@ -311,10 +354,6 @@ export default {
//货柜位置
locationList:[],
//重货默认开启状态
zhongLinjieFlag: true,
//泡货默认开启状态
paoLinjieFlag: true,
// 遮罩层
loading: true,
......@@ -360,21 +399,38 @@ export default {
advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }],
containerLocation:[{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
square:[{ required: true, message: "方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
// paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
},
lineList: [],
transportDatas: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE),
advanceStatusDictDatas: getDictDatas(DICT_TYPE.ADVANCE_STATUS),
AuditStatusEnum: AuditStatusEnum,
auditStatusDictDatas: getDictDatas(DICT_TYPE.AUDIT_STATUS),
locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
lineList: []
};
},
computed: {
getTypeName() {
return typeId => {
for(let index in this.typeList) {
let typeItem = this.typeList[index];
if(typeItem.id == typeId) {
return typeItem.titleZh;
}
}
}
},
statusName() {
return row => {
if(row.blacklist) return '黑名单';
if(row.auditStatus === AuditStatusEnum.PASS) return '已审核';
return '已下架';
}
},
transportName() {
return transportType => {
for(let index in this.transportDatas) {
......@@ -445,6 +501,7 @@ export default {
this.getTypeList();
}
this.getAttrList();
this.getList();
//获取城市列表
this.getAllCityList();
......@@ -457,6 +514,13 @@ export default {
methods: {
/** 获取产品属性列表 */
getAttrList() {
getProductAttrList().then(response => {
this.attrList = response.data;
})
},
/** 获取产品类型列表 */
getTypeList() {
getProductTypeList().then(response => {
......@@ -592,8 +656,6 @@ export default {
this.form.dayLimit = this.product.dayLimit;
this.form.containerLocation = this.product.containerLocation;
this.form.square = this.product.square;
this.form.paoLinjie = this.product.paoLinjie;
this.form.zhongLinjie = this.product.zhongLinjie;
if(this.currecyList) {
let priceUnitId = this.currecyList[0].id;
......@@ -608,8 +670,6 @@ export default {
this.isUpdate = false;
this.open = true;
this.title = "添加路线价格";
this.setZhongValue();
this.setPaoValue();
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -632,6 +692,24 @@ export default {
});
},
updateStatus(row, type) {
if(type == 'blacklist') {
row.blacklist=row.blacklist == 0 ? 1 : 0;
} else if(type == 'auditStatus') {
row.auditStatus=row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
}
updateProductPrice(row).then(() => {
this.$modal.msgSuccess("修改成功");
}).catch(function() {
if(statusType == 'blacklist') {
row.blacklist = row.blacklist === 1 ? 0 : 1;
} else {
row.auditStatus = row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
}
});
},
checkSelectable() {
return !this.isUpdate;
......@@ -659,12 +737,13 @@ export default {
this.$message.error('请选择线路');
return;
}
let lineIdList = [];
let lineChannelList = [];
//TODO ，lineChannelList实体空运的时候需要传出货渠道ID--shippingChannelId
this.lineList.map((item) => {
lineIdList.push(item.id);
lineChannelList.push({lineId: item.id});
return item;
});
this.form.lineIdList = lineIdList;
this.form.lineChannelList = lineChannelList;
// 修改的提交
if (this.form.id != null) {
......@@ -709,28 +788,7 @@ export default {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
},
zhongpaoChange(type) {
if(type == 'zhong') {
this.setZhongValue();
} else if(type == 'pao') {
this.setPaoValue();
}
},
setZhongValue() {
// console.log(this.product);
if(this.zhongLinjieFlag && this.product.zhongLinjie) {
this.form.zhongLinjie = parseFloat(this.product.zhongLinjie);
}
},
setPaoValue() {
if(this.paoLinjieFlag && this.product.paoLinjie) {
this.form.paoLinjie = parseFloat(this.product.paoLinjie);
}
},
}
}
};
</script>
......
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