Skip to content

J
jiedao-app-operator-master
Commit 3abc43ec authored by 我在何方's avatar 我在何方
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents b07cd6fb 68b7bb0e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 434 additions and 285 deletions
src/api/ecw/box.js
View file @ 3abc43ec
......@@ -275,7 +275,6 @@ export function downloadSoncapFiles(params) {
export function downloadCustomFiles(params) {
return request({
url: "/ecw/box-preload-goods/downloadCustomFiles",
responseType: "arraybuffer",
method: "get",
params,
});
......
src/api/ecw/boxSea.js
View file @ 3abc43ec
......@@ -701,6 +701,21 @@ export function batchUnload(data) {
});
}
/**
* 单个卸柜
*
* @export
* @param {*} data
* @return {*}
*/
export function singleUnload(data) {
return request({
url: "/ecw/box-load-info/singleUnload",
method: "post",
data,
});
}
/**
* 一键卸柜
*
......
src/api/ecw/customer.js
View file @ 3abc43ec
......@@ -149,10 +149,18 @@ export function getMyCustomerService(query){
})
}
//获取会员列表
export function userMemberUserList(){
export function userMemberUserList(params){
return request({
url:'/member/user/member-user-list',
method:'get'
method:'get',
params
})
}
export function memberUserList(params){
return request({
url:'/member/user/list',
method:'get',
params
})
}
//查看某客户授权的品牌
......
src/api/ecw/customerCommissionInfo.js
View file @ 3abc43ec
......@@ -21,11 +21,11 @@ export function itemTypeListApi(query){
})
}
//
export function customerDropDownList(query){
export function customerDropDownList(params){
return request({
url:'/ecw/customer/select',
method:'get',
query,
params,
})
}
//商品
......
src/components/CustomersSelector/index.vue
View file @ 3abc43ec
......@@ -128,4 +128,4 @@ export default {
overflow-x: hidden;
padding: 0 10px;
}
</style>
\ No newline at end of file
</style>
src/components/WarehouseAreaDialog/index.vue
View file @ 3abc43ec
......@@ -13,7 +13,7 @@
<div style="text-align: center">区域</div>
<div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
<el-row :gutter="20">
<el-col :span="12" v-for="(warehouse, i) in item.children" :key="i">
<el-col :span="12" v-for="warehouse in item.children" :key="warehouse.id">
<div
class="warehouse-block"
:class="{'warehouse-block-selected': warehouse.selected, 'warehouse-block-active': warehouse.id === activeWarehouse.id}"
......@@ -28,14 +28,25 @@
<div>
<div style="text-align: center">仓位</div>
<div class="position-group">
<div class="position" v-for="position in activeWarehouse.positionList" :key="item.id">
<div
class="position-item"
v-for="item in position.children"
@click="handleSelectPosition(item)"
:class="{'position-item-active': item.selected}">
{{ item.code }}
</div>
<div class="position" v-for="position in activeWarehouse.positionList" :key="position.id" @click="handleSelectPosition(position)">
<template v-if="position.children">
<div
class="position-item"
v-for="item in position.children"
:key="item.id"
@click.stop="handleSelectPositionChild(item)"
:class="{'position-item-active': item.selected}">
{{ item.code }}
</div>
</template>
<template v-else>
<div
class="position-item"
:class="{'position-item-active': position.selected}">
{{ position.code }}
</div>
</template>
</div>
</div>
</div>
......@@ -82,7 +93,8 @@ export default {
activeName: '0',
selectedWarehouse: [],
selectedPosition: [],
activeWarehouse: {}
activeWarehouse: {},
activeWarehouseId: undefined
};
},
......@@ -100,6 +112,7 @@ export default {
f.selected = false
if(f.positionList) f.positionList.forEach(g => {
// 位置
g.selected = false
g.children?.forEach(k => {
// 子位置
k.selected = false
......@@ -130,18 +143,21 @@ export default {
this.activeWarehouse = warehouse
if (!!warehouse.selected) {
warehouse.selected = false
} else if(this.activeWarehouseId !== warehouse.id) {
this.activeWarehouseId = warehouse.id
} else {
warehouse.selected = true
// 区域被选，清空该区域下的位置
if(warehouse.positionList) warehouse.positionList.forEach(g => {
if(warehouse.positionList) warehouse.positionList?.forEach(g => {
g.selected = false
g.children?.forEach(k => {
k.selected = false
})
})
}
},
handleSelectPosition(position) {
handleSelectPositionChild(position) {
if (!!position.selected) {
position.selected = false
......@@ -150,7 +166,7 @@ export default {
if (!parentAre.selected) {
// 检查父区域下是否所有位置被反选
let hasSelected = false
parentAre.positionList.forEach(g => {
parentAre.positionList?.forEach(g => {
// 位置
g.children?.forEach(k => {
// 子位置
......@@ -166,6 +182,17 @@ export default {
// 选位置时，父区域反选
this.area.find(e => e.id === position.domainId).children.find(f => f.id === position.areaId).selected = false
}
},
handleSelectPosition(position) {
if (!!position.selected) {
position.selected = false
} else {
position.selected = true
// 选位置时，父区域反选
this.area.find(e => e.id === position.domainId).children.find(f => f.id === position.areaId).selected = false
}
}
},
......@@ -179,17 +206,17 @@ export default {
selected() {
const result = []
this.area.forEach(e => {
this.area?.forEach(e => {
// 仓库
e.children.forEach(f => {
e.children?.forEach(f => {
// 区域
if (f.selected) result.push(f.code)
else if(f.positionList) f.positionList.forEach(g => {
else f.positionList?.forEach(g => {
// 位置
if (g.selected) result.push(k.code)
g.children?.forEach(k => {
if (g.selected) result.push(f.code + g.code)
else if(g.children) g.children?.forEach(k => {
// 子位置
if (k.selected) result.push(k.code)
if (k.selected) result.push(f.code + k.code)
})
})
})
......@@ -200,33 +227,35 @@ export default {
inputValue(){
const result = []
this.area.forEach(e => {
this.area?.forEach(e => {
// 仓库
e.children.forEach(f => {
e.children?.forEach(f => {
// 区域
if (f.selected) result.push({
orderId: this.orderId,
wareId: f.pid,
areaId: f.id
})
else if(f.positionList) f.positionList.forEach(g => {
// 位置
if (g.selected) result.push({
orderId: this.orderId,
wareId: g.domainId,
areaId: g.areaId,
locationId: g.id
})
else g.children.forEach(k => {
// 子位置
if (k.selected) result.push({
else {
f.positionList?.forEach(g => {
// 位置
if (g.selected) result.push({
orderId: this.orderId,
wareId: k.domainId,
areaId: k.areaId,
locationId: k.id
wareId: g.domainId,
areaId: g.areaId,
locationId: g.id
})
else g.children?.forEach(k => {
// 子位置
if (k.selected) result.push({
orderId: this.orderId,
wareId: k.domainId,
areaId: k.areaId,
locationId: k.id
})
})
})
})
}
})
})
......@@ -269,9 +298,10 @@ export default {
border: 1px #EFEFEF solid;
gap: 1px;
min-height: 64px;
flex-flow: wrap;
}
.position{
width: 20%;
width: calc(20% - 1px);
height: 64px;
display: flex;
flex-direction: column;
......
src/views/ecw/box/indexSea.vue
View file @ 3abc43ec
This diff is collapsed.
src/views/ecw/box/ladingBill/index.vue
View file @ 3abc43ec
......@@ -192,6 +192,7 @@ export default {
}
this.currRow = row;
this.$set(this.dialogCfg, "type", type);
this.$set(this.dialogCfg, "width", "750px");
this.$set(this.dialogCfg, "visible", true);
},
makeBill(row) {
......@@ -201,11 +202,10 @@ export default {
}).then((res) => {
const { data } = res;
const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
let billContent = `${titleZh}${data.orderInfo}${contentZh}`,
orderNo = data.orderInfo?.orderNo ?? "";
let billContent = `${titleZh}${data.orderInfo}${contentZh}`;
this.currData = {
billContent,
orderNo,
orderNo: this.currRow.orderNo,
};
});
},
......
src/views/ecw/box/ladingBill/makeLadingBill.vue
View file @ 3abc43ec
......@@ -3,7 +3,9 @@
<el-row>
<div class="title-orderNo">订单号：{{orderNo}}</div>
</el-row>
<vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" />
<el-row class="ueditor-row">
<vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" style="max-width: 690px;" />
</el-row>
<!-- 审核流程 -->
<el-row class="process-area">
......@@ -22,7 +24,7 @@
</div>
</el-row>
<el-dialog :title="dialogCfg.title" :visible.sync="visible" width="80%" append-to-body class="shippingSea-dialog">
<el-dialog :title="dialogCfg.title" :visible.sync="visible" width="850px" append-to-body class="shippingSea-dialog">
<previewBill v-if="visible" :contentHtml="billContent" :currRow="currRow" :type="dialogCfg.type" />
</el-dialog>
</el-row>
......@@ -234,5 +236,9 @@ export default {
text-align: center;
}
}
.ueditor-row {
display: flex;
justify-content: center;
}
}
</style>
src/views/ecw/box/ladingBill/previewBill.vue
View file @ 3abc43ec
<template>
<el-row>
<div v-html="contentHtml"></div>
<div v-html="contentHtml" class="contentHtml"></div>
<el-row v-if="currRow.status === 2 && type === 'previewBill'" style="text-align: center;">
<el-button type="primary" @click="download">下载</el-button>
<el-button type="primary" @click="print">打印</el-button>
......@@ -55,6 +55,11 @@ export default {
};
</script>
<style lang="scss" scoped>
::v-deep .contentHtml {
> table {
width: 96% !important;
margin-left: 2%;
}
}
</style>
src/views/ecw/box/shippingDetail.vue
View file @ 3abc43ec
......@@ -16,7 +16,7 @@
{{getVolumeWeight(loadDetail.totalStatistics)}}
</el-descriptions-item>
<el-descriptions-item label="货柜状态">
{{getCabinetStatus(boxBackVO)}}
{{boxBackVO.shipmentStatusText}}
</el-descriptions-item>
</el-descriptions>
......@@ -47,7 +47,7 @@
{{getVolumeWeight(loadDetail.totalStatistics)}}
</el-descriptions-item>
<el-descriptions-item label="货柜状态">
{{getCabinetStatus(boxBackVO)}}
{{boxBackVO.shipmentStatusText}}
</el-descriptions-item>
</el-descriptions>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @ 3abc43ec
......@@ -182,15 +182,15 @@
<el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="100px">
<el-row>
<el-form-item label="中文品名:" prop="prodTitleZh">
<el-select v-model="shopForm.prodTitleZh" placeholder="请选择中文品名" @change="changeProdTitleZh">
<el-option v-for="item in orderItems" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh"></el-option>
<el-select v-model="shopForm.zhId" placeholder="请选择中文品名" @change="changeProdTitleZh">
<el-option v-for="item in orderItems" :label="item.prodTitleZh" :value="iitem.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="英文品名:" prop="prodTitleEn">
<el-select v-model="shopForm.prodTitleEn" placeholder="请选择英文品名" @change="changeProdTitleEn">
<el-option v-for="item in orderItems" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn"></el-option>
<el-select v-model="shopForm.enId" placeholder="请选择英文品名" @change="changeProdTitleEn">
<el-option v-for="item in orderItems" :label="item.prodTitleEn" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="剩余箱数:">
......@@ -318,22 +318,18 @@ export default {
},
/* 打开拆单 */
getSplit() {
this.querySplitGoods().then((res) => {
if (res) {
if (this.currRow.goodsList && this.currRow.goodsList.length) {
const [orderItem] = this.currRow.goodsList;
createSplit({
parentOrderId: this.currRow.orderId,
parentOrderNo: this.currRow.orderNo,
dstWarehouseId: orderItem.destWarehouseId,
transportId: orderItem.transportId,
shipmentType: 1,
}).then((res) => {
this.querySplitGoods();
});
}
}
});
if (this.currRow.goodsList && this.currRow.goodsList.length) {
const [orderItem] = this.currRow.goodsList;
createSplit({
parentOrderId: this.currRow.orderId,
parentOrderNo: this.currRow.orderNo,
dstWarehouseId: orderItem.destWarehouseId,
transportId: orderItem.transportId,
shipmentType: 1,
}).then((res) => {
this.querySplitGoods();
});
}
},
/* 查询拆单项 */
querySplitGoods() {
......@@ -346,6 +342,7 @@ export default {
const { orderSplitBackVOList } = res.data;
if (orderSplitBackVOList && orderSplitBackVOList.length) {
this.orderItems = this.currRow.goodsList ?? [];
console.log(this.orderItems)
// 取拆单项
this.splitData = orderSplitBackVOList.filter(
(item) => !item.isMaster
......@@ -389,8 +386,14 @@ export default {
leviteSum,
column.warehouseInInfoVO?.cartonsNum ?? 0
).toNumber();
leviteV += Decimal.add(leviteV, column.warehouseInInfoVO?.volume ?? 0).toFixed(2);
leviteW += Decimal.add(leviteW, column.warehouseInInfoVO?.weight ?? 0).toFixed(2);
leviteV = Decimal.add(
leviteV,
column.warehouseInInfoVO?.volume ?? 0
).toFixed(2);
leviteW = Decimal.add(
leviteW,
column.warehouseInInfoVO?.weight ?? 0
).toFixed(2);
});
sums[1] =
"下单统计：" +
......@@ -438,7 +441,7 @@ export default {
changeProdTitleZh() {
let list = [];
list = this.currRow.goodsList.filter(
(item) => item.prodTitleZh == this.shopForm.prodTitleZh
(item) => item.id == this.shopForm.zhId
);
this.shopForm.sum =
this.currRow.num - this.currRow.installNum - this.totalSplitNum();
......@@ -448,7 +451,7 @@ export default {
changeProdTitleEn() {
let list = [];
list = this.orderData.orderItemVOList.filter(
(item) => item.prodTitleEn == this.shopForm.prodTitleEn
(item) => item.id == this.shopForm.enId
);
this.shopForm.sum =
this.currRow.num - this.currRow.installNum - this.totalSplitNum();
......@@ -460,7 +463,10 @@ export default {
if (valid) {
// 输入箱数大于实装箱数
const total = this.totalSplitNum();
const canSplitNum = Decimal.sub(this.currRow.num, this.currRow.installNum).toNumber();
const canSplitNum = Decimal.sub(
this.currRow.num,
this.currRow.installNum
).toNumber();
const remain = Decimal.sub(canSplitNum, total).toNumber();
if (this.shopForm.num > remain) {
this.$message.error("放入箱数不能大于总箱数");
......
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ 3abc43ec
......@@ -545,7 +545,7 @@ export default {
},
/* 是否显示拆单 */
isShowSplitOrder(row) {
if (row.num > row.installNum) {
if (row.num > row.installNum && row.installNum !== 0) {
return true;
}
return false;
......
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @ 3abc43ec
......@@ -159,7 +159,7 @@ import {
formatDateStr,
serviceMsg,
toReviewDetail,
downloadFile,
downloadFileByUrl,
} from "../utils";
import ImageUpload from "@/components/ImageUpload";
import Decimal from "decimal.js";
......@@ -477,12 +477,7 @@ export default {
},
/* 下载报关单 */
downloadCusFile() {
downloadFile(
"downloadCustomFiles",
{ shipmentId: this.shipmentObj.id },
`报关单(${this.shipmentObj.selfNo}).xlsx`,
"xlsx"
);
downloadFileByUrl('downloadCustomFiles', { shipmentId: this.shipmentObj.id });
},
},
watch: {
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ 3abc43ec
......@@ -5,8 +5,9 @@
<el-row class="number-area">
<p class="label-font">自编号：</p>
<p class="label-font">{{selfNo}}</p>
<el-input v-model="labelNo" placeholder="请输入标签号"></el-input>
<el-input v-model="labelNo" placeholder="请输入"></el-input>
<div>
<el-button type="primary" @click="modifyUnload">提交</el-button>
<el-button type="primary" @click="modifyBatchUnload">批量输入</el-button>
<el-button type="primary" @click="modifyAllUnload">一键卸柜</el-button>
</div>
......@@ -122,6 +123,7 @@ import {
approvalCreate,
approvalCancel,
getSectionList,
singleUnload,
} from "@/api/ecw/boxSea";
import { serviceMsg, getTotlContent, toReviewDetail } from "../../utils";
import WorkFlow from "@/components/WorkFlow";
......@@ -190,14 +192,30 @@ export default {
this.loading = false;
});
},
/* 单个卸柜 */
modifyUnload() {
if (!this.labelNo) {
this.$message.error("请输入箱号标签");
return;
}
singleUnload({
orderNumCode: this.labelNo,
shipmentId: this.$attrs.shipmentObj.id,
}).then((res) => {
serviceMsg(res, this).then((res) => {
this.labelNo = "";
this.getLoadGoodsList();
});
});
},
/* 批量输入 */
modifyBatchUnload() {
if (!this.labelNo) {
this.$message.error("请输入标签号");
this.$message.error("请输入订单号");
return;
}
batchUnload({
orderNumCode: this.labelNo,
orderNo: this.labelNo,
shipmentId: this.$attrs.shipmentObj.id,
}).then((res) => {
serviceMsg(res, this).then((res) => {
......
src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue
View file @ 3abc43ec
......@@ -20,7 +20,7 @@
{{importCityName(shipmentObj.destWarehouseId)}}
</el-descriptions-item>
<el-descriptions-item label="状态">
{{statusLabel}}
{{shipmentObj.shipmentStatusText}}
</el-descriptions-item>
</el-descriptions>
</el-card>
......
src/views/ecw/customer/edit.vue
View file @ 3abc43ec
......@@ -282,8 +282,8 @@
>
<template v-slot = "{row}">
<el-form-item label="">
<el-select v-model="row.userid" @change="selectBD" size="mini" filterable>
<el-option v-for="(item,index) in memberList" :value="item.id" :key="item.id" :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
<el-select v-model="row.userid" remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
<el-option v-for="(item,index) in userMemberUser" :value="item.id" :key="index" :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
</el-select>
</el-form-item>
</template>
......@@ -408,7 +408,7 @@ import {
createCustomer,
getCustomer,
getCustomerList,
getCustomerPage,
getCustomerPage, memberUserList,
updateCustomer,
userMemberUserList,
} from '@/api/ecw/customer'
......@@ -440,16 +440,23 @@ export default {
created() {
this.getCustomerSelect()
this.reset()
this.getUserMemberUserFn()
if(this.customerId !== '0') {
// 编辑客户
this.getCustomer(this.customerId).then(() => {
getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
this.form.customerContacts = r.data
getCustomerList({ids:this.form.promoter}).then(r => {
console.log(r,'r');
this.recommended = r.data;
})
let list = this.form.customerContacts.map(item => item.userid);
if(list.length >0){
memberUserList({ids:list.join(',')}).then(r=>{
this.selectMemberList = r.data
})
}
if(this.form.promoter){
getCustomerList({ids:this.form.promoter}).then(r => {
this.recommended = r.data;
})
}
})
})
} else {
......@@ -478,10 +485,6 @@ export default {
getCountryListAll().then(r => {
this.countryList = r.data
})
userMemberUserList().then(r => {
this.memberList = r.data
})
this.getZhongPao()
},
data(){
......@@ -532,10 +535,16 @@ export default {
zhongLines: [], // 重货线路
paoLines: [], // 泡货线路
memberList:[],//会员列表
selectMemberList:[]//选中会员列表
}
},
methods: {
getUserMemberUserFn(val){
userMemberUserList({pageNo:1,pageSize:100,searchKey:val}).then(r => {
this.memberList = r.data.list
})
},
remoteMethod(val){
this.getCustomerSelect(val);
},
......@@ -585,8 +594,12 @@ export default {
this.form.customerContacts[0].isDefault = 1
}
},
selectBD(){
this.$forceUpdate();
selectBD(val){
let i = this.selectMemberList.find(item => item.id === val);
if(i === undefined){
this.selectMemberList.push(this.memberList.find(item => item.id === val))
}
this.getUserMemberUserFn()
},
/** 取消按钮 */
cancel() {
......@@ -743,6 +756,12 @@ export default {
}
},
computed: {
userMemberUser(){
let list = this.memberList.filter(item => {
return this.selectMemberList.findIndex(i => i.id === item.id) < 0
})
return [...this.selectMemberList,...list]
},
productListFilter(){
return this.productList.filter((p) => p.typeId === this.form.productType)
},
......
src/views/ecw/customer/query.vue
View file @ 3abc43ec
......@@ -406,7 +406,7 @@ import {
orderStatistics,
creditLogCreate,
creditScoreStatistic,
infoListReceiptPage, userMemberUserList
infoListReceiptPage, userMemberUserList, memberUserList
} from '@/api/ecw/customer'
import { DICT_TYPE, getDictDataLabel, getDictDatas2 } from '@/utils/dict'
import { getProductTypeList } from '@/api/ecw/productType'
......@@ -444,6 +444,10 @@ export default {
getCustomerContactsListByCustomer({customerId: this.id}).then(r => {
this.customerContacts = r.data
let list = this.customerContacts.map(r => r.userid)
memberUserList({ids:list.join(',')}).then(r => {
this.memberList = r.data
})
})
getCountry(this.customer.country ? this.customer.country : 0 ).then(r => {
......@@ -469,9 +473,7 @@ export default {
this.creditScoreStatisticFn()
this.infoListReceiptFn()
userMemberUserList().then(r => {
this.memberList = r.data
})
},
data() {
return {
......
src/views/ecw/customerCommission/index.vue
View file @ 3abc43ec
......@@ -5,13 +5,15 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('客户名称')" prop="customerId" >
<el-select
:remote-method="customerDropDownFn"
remote
clearable
filterable
v-model="queryParams.customerId"
:placeholder="$t('请输入关键词')">
<el-option
v-for="(item, index) in customeList"
:key="index"
v-for="(item, index) in customerNameFn"
:key="item.id"
:value="item.id"
:label="item.name"
>
......@@ -140,6 +142,7 @@ import {deleteCustomerCommission, getCustomerCommissionPage, exportCustomerCommi
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
import {getTradeCityList} from "@/api/ecw/region";
import {customerDropDownList} from "@/api/ecw/customerCommissionInfo";
import {getCustomerList} from "@/api/ecw/customer";
export default {
name: "CustomerCommission",
......@@ -187,6 +190,7 @@ export default {
darkReturnType: [{ required: true, message: this.$t('暗佣类型 1产品2达标不能为空'), trigger: "change" }],
},
customeList:[],
selectCustomeList:[]
};
},
computed:{
......@@ -198,16 +202,24 @@ export default {
exportCityList(){
return this.tradeCityList.filter(item => item.type == 2)
},
customerNameFn(){
if(this.selectCustomeList.length > 0){
let i = this.customeList.findIndex(item => item.id === this.selectCustomeList[0].id)
if(i < 0){
this.customeList.unshift(this.selectCustomeList[0])
}
}
return this.customeList
}
},
created() {
customerDropDownList().then(res => {
console.log(res);
if (res.code === 0) {
this.customeList = res.data
}
})
this.customerDropDownFn()
if(this.$route.query.customerId){
this.queryParams.customerId = Number(this.$route.query.customerId)
getCustomerList({ids:this.queryParams.customerId}).then(r =>{
console.log(r,'rrr');
this.selectCustomeList = r.data
})
}
this.getList();
getTradeCityList().then(res => {
......@@ -215,6 +227,13 @@ export default {
})
},
methods: {
customerDropDownFn(val){
customerDropDownList({pageNo:1,pageSize: 100,searchKey:val}).then(res => {
if (res.code === 0) {
this.customeList = res.data.list
}
})
},
/** 查询列表 */
getList() {
this.loading = true;
......
src/views/ecw/messageLeave/index.vue
View file @ 3abc43ec
This diff is collapsed.
src/views/ecw/order/transferWarehousing.vue
View file @ 3abc43ec
......@@ -84,7 +84,10 @@
<el-descriptions-item :label="$t('联系电话')">
<el-input :disabled="type == 2" v-model="params.phone"></el-input>
</el-descriptions-item>
<el-descriptions-item :label="$t('出仓日期')" >
<el-descriptions-item>
<template slot="label">
<span style="color: red;font-size: 20px;margin-right: 5px;">*</span>{{$t('出仓日期')}}
</template>
<el-date-picker
:disabled="type == 2"
value-format="yyyy-MM-dd HH:mm:ss"
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 3abc43ec
......@@ -174,13 +174,16 @@
<el-tab-pane label="添加新品名" name="second" v-if="!edit">
<el-descriptions border :column="2">
<el-descriptions-item label="中文品名">
<el-descriptions-item>
<template slot="label"><span style="color: red">*</span> 中文品名</template>
<product-selector v-model="form1.prodId" @change="onProductChange"/>
</el-descriptions-item>
<el-descriptions-item label="英文品名">
<el-descriptions-item>
<template slot="label"><span style="color: red">*</span> 英文品名</template>
<product-selector lang="En" v-model="form1.prodId" @change="onProductChange"/>
</el-descriptions-item>
<el-descriptions-item label="品牌">
<template slot="label"><span style="color: red">*</span> 品牌</template>
<el-select
v-model="form1.brand"
placeholder="可修改"
......@@ -195,8 +198,14 @@
</el-option>
</el-select>
</el-descriptions-item>
<el-descriptions-item label="是否备案">{{ isBeian1 }}</el-descriptions-item>
<el-descriptions-item label="收费模式">{{ feeType1 }}</el-descriptions-item>
<el-descriptions-item label="是否备案">
<template slot="label"><span style="color: red">*</span> 是否备案</template>
{{ isBeian1 }}
</el-descriptions-item>
<el-descriptions-item label="收费模式">
<template slot="label"><span style="color: red">*</span> 收费模式</template>
{{ feeType1 }}
</el-descriptions-item>
<el-descriptions-item label="填单参数">非填单货物</el-descriptions-item>
</el-descriptions>
<el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
......@@ -219,6 +228,9 @@
:data="tableData1"
style="width: 100%">
<el-table-column label="箱数" width="150px">
<template v-slot:header>
<span style="color: red">*</span> 箱数
</template>
<template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
<span v-if="tableData1[$index].id">
......@@ -232,6 +244,9 @@
</template>
</el-table-column>
<el-table-column label="包装类型" width="100px">
<template v-slot:header>
<span style="color: red">*</span> 包装类型
</template>
<template v-slot="{r,c,$index}">
<el-form-item>
<span v-if="tableData1[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span>
......@@ -264,6 +279,9 @@
</template>
</el-table-column>
<el-table-column label="体积(m³)">
<template v-slot:header>
<span style="color: red">*</span> 体积(m³)
</template>
<template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].volume }}</span>
......@@ -272,6 +290,9 @@
</template>
</el-table-column>
<el-table-column label="重量(Kg)">
<template v-slot:header>
<span style="color: red">*</span> 重量(Kg)
</template>
<template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].weight }}</span>
......@@ -280,6 +301,9 @@
</template>
</el-table-column>
<el-table-column label="数量" width="130px">
<template v-slot:header>
<span style="color: red">*</span> 数量
</template>
<template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].quantityAll }}</span>
......@@ -424,7 +448,7 @@ export default {
quantityAll: [{required: true, message: "数量不能为空", trigger: "change"}]
},
form1: {
"brand": "0",
"brand": undefined,
"brandType": 0,
"inTime": "",
"material": "",
......@@ -463,7 +487,7 @@ export default {
opened(val) {
if (val) {
this.form.material = this.warehousing.material
this.form.brand = this.warehousing.brand || '0'
this.form.brand = this.warehousing.brand
this.handleBrandChange(this.form.brand)
} else {
this.$emit('update:visible', false)
......
src/views/ecw/order/warehousing/index.vue
View file @ 3abc43ec
This diff is collapsed.
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